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

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 {

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 {