From f1a16fe83800d4c91554b4a9fca80acb18f075a2 Mon Sep 17 00:00:00 2001
From: "aaronleventhal%moonset.net"
 <aaronleventhal%moonset.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 1 Dec 2004 16:17:44 +0000
Subject: [PATCH] Bug 269212. CSS select:focus outline too large on combobox,
 extending past the right side.  Make sure to FinishAndStoreOverflow() even if
 returning early from nsComboboxFrame::Reflow(). r+sr=roc

git-svn-id: svn://10.0.0.236/trunk@166058 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/forms/nsComboboxControlFrame.cpp          | 2 ++
 mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index f7dd3a9591b..64fa21a6761 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -1175,6 +1175,7 @@ nsComboboxControlFrame::Reflow(nsPresContext*          aPresContext,
     aDesiredSize.mOverflowArea.y      = 0;
     aDesiredSize.mOverflowArea.width  = aDesiredSize.width;
     aDesiredSize.mOverflowArea.height = aDesiredSize.height;
+    FinishAndStoreOverflow(&aDesiredSize);
     return NS_OK;
   }
 
@@ -1420,6 +1421,7 @@ nsComboboxControlFrame::Reflow(nsPresContext*          aPresContext,
         aDesiredSize.mOverflowArea.y      = 0;
         aDesiredSize.mOverflowArea.width  = aDesiredSize.width;
         aDesiredSize.mOverflowArea.height = aDesiredSize.height;
+        FinishAndStoreOverflow(&aDesiredSize);
         return NS_OK;
       }
     } else {
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index f7dd3a9591b..64fa21a6761 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -1175,6 +1175,7 @@ nsComboboxControlFrame::Reflow(nsPresContext*          aPresContext,
     aDesiredSize.mOverflowArea.y      = 0;
     aDesiredSize.mOverflowArea.width  = aDesiredSize.width;
     aDesiredSize.mOverflowArea.height = aDesiredSize.height;
+    FinishAndStoreOverflow(&aDesiredSize);
     return NS_OK;
   }
 
@@ -1420,6 +1421,7 @@ nsComboboxControlFrame::Reflow(nsPresContext*          aPresContext,
         aDesiredSize.mOverflowArea.y      = 0;
         aDesiredSize.mOverflowArea.width  = aDesiredSize.width;
         aDesiredSize.mOverflowArea.height = aDesiredSize.height;
+        FinishAndStoreOverflow(&aDesiredSize);
         return NS_OK;
       }
     } else {