Backed out changeset 0579d0d5f0c0 (bug 1562057) by dev's request. CLOSED TREE

layout/forms/nsComboboxControlFrame.cpp

@@ -717,10 +717,9 @@ nscoord nsComboboxControlFrame::GetIntrinsicISize(
         presContext, aRenderingContext, GetWritingMode());
   }
 
-  const bool isSizedAsEmpty = StyleDisplay()->IsContainSize() ||
+  const bool isContainSize = StyleDisplay()->IsContainSize();
-                              mDisplayedOptionTextOrPreview.IsEmpty();
   nscoord displayISize = 0;
-  if (MOZ_LIKELY(mDisplayFrame) && !isSizedAsEmpty) {
+  if (MOZ_LIKELY(mDisplayFrame) && !isContainSize) {
     displayISize = nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
                                                         mDisplayFrame, aType);
   }
@@ -731,14 +730,14 @@ nscoord nsComboboxControlFrame::GetIntrinsicISize(
         LookAndFeel::GetInt(LookAndFeel::eIntID_UseOverlayScrollbars) != 0;
     if (aType == nsLayoutUtils::MIN_ISIZE) {
       dropdownContentISize =
-          isSizedAsEmpty ? 0 : mDropdownFrame->GetMinISize(aRenderingContext);
+          isContainSize ? 0 : mDropdownFrame->GetMinISize(aRenderingContext);
       if (isUsingOverlayScrollbars) {
         dropdownContentISize += scrollbarWidth;
       }
     } else {
       NS_ASSERTION(aType == nsLayoutUtils::PREF_ISIZE, "Unexpected type");
       dropdownContentISize =
-          isSizedAsEmpty ? 0 : mDropdownFrame->GetPrefISize(aRenderingContext);
+          isContainSize ? 0 : mDropdownFrame->GetPrefISize(aRenderingContext);
       if (isUsingOverlayScrollbars) {
         dropdownContentISize += scrollbarWidth;
       }
@@ -989,11 +988,8 @@ void nsComboboxControlFrame::HandleRedisplayTextEvent() {
 void nsComboboxControlFrame::ActuallyDisplayText(bool aNotify) {
   RefPtr<nsTextNode> displayContent = mDisplayContent;
   if (mDisplayedOptionTextOrPreview.IsEmpty()) {
-    // Have to use a non-collapsing space of some kind
+    // Have to use a non-breaking space for line-block-size calculations
-    // for line-block-size calculations to be right.
+    // to be right
-    // Which one doesn't really matter,
-    // as the inline size will be ignored
-    // (see isSizedAsEmpty in GetIntrinsicISize).
     static const char16_t space = 0xA0;
     displayContent->SetText(&space, 1, aNotify);
   } else {

layout/reftests/w3c-css/submitted/contain/reftest.list

@@ -36,7 +36,7 @@ fuzzy-if(webrender&&winWidget,0-24,0-2) == contain-size-inline-flex-001.html con
 == contain-size-multicol-002.html contain-size-multicol-002-ref.html
 == contain-size-multicol-003.html contain-size-multicol-003-ref.html
 fuzzy-if(Android,0-4,0-4) == contain-size-select-elem-001.html contain-size-select-elem-001-ref.html # bug 1480862
-== contain-size-select-elem-002.html contain-size-select-elem-002-ref.html
+fails-if(!gtkWidget) == contain-size-select-elem-002.html contain-size-select-elem-002-ref.html # bug 1562057
 == contain-size-select-elem-003.html contain-size-select-elem-003-ref.html
 == contain-size-select-elem-004.html contain-size-select-elem-004-ref.html
 == contain-size-select-elem-005.html contain-size-select-elem-005-ref.html

testing/web-platform/meta/css/css-contain/contain-size-select-001.html.ini

@@ -0,0 +1,3 @@
+[contain-size-select-001.html]
+  expected: FAIL
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1562057

testing/web-platform/meta/css/css-contain/contain-size-select-002.html.ini

@@ -0,0 +1,3 @@
+[contain-size-select-002.html]
+  expected: FAIL
+  bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1562057

testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-size-select-elem-002.html.ini

@@ -0,0 +1,4 @@
+[contain-size-select-elem-002.html]
+  expected:
+    if os == "linux": PASS
+    FAIL