Backed out changeset 842955b61f01 (bug 1365806) for wr failures on contain-size-scrollbars-002.html . CLOSED TREE

Author: nbeleuzu

layout/generic/nsGfxScrollFrame.cpp

@@ -385,7 +385,10 @@ static void GetScrollbarMetrics(nsBoxLayoutState& aState, nsIFrame* aBox,
  * 1) the style is not HIDDEN
  * 2) our inside-border height is at least the scrollbar height (i.e., the
  * scrollbar fits vertically)
- * 3) the style is SCROLL, or the kid's overflow-area XMost is
+ * 3) our scrollport width (the inside-border width minus the width allocated
+ * for a vertical scrollbar, if showing) is at least the scrollbar's min-width
+ * (i.e., the scrollbar fits horizontally)
+ * 4) the style is SCROLL, or the kid's overflow-area XMost is
  * greater than the scrollport width
  *
  * @param aForce if true, then we just assume the layout is consistent.
@@ -411,37 +414,42 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
     ReflowScrolledFrame(aState, aAssumeHScroll, aAssumeVScroll, aKidMetrics);
   }
 
+  nsSize vScrollbarMinSize(0, 0);
   nsSize vScrollbarPrefSize(0, 0);
   if (mHelper.mVScrollbarBox) {
     GetScrollbarMetrics(aState->mBoxState, mHelper.mVScrollbarBox,
-                        nullptr,
+                        &vScrollbarMinSize,
                         aAssumeVScroll ? &vScrollbarPrefSize : nullptr);
     nsScrollbarFrame* scrollbar = do_QueryFrame(mHelper.mVScrollbarBox);
     scrollbar->SetScrollbarMediatorContent(mContent);
   }
   nscoord vScrollbarDesiredWidth =
       aAssumeVScroll ? vScrollbarPrefSize.width : 0;
+  nscoord vScrollbarMinHeight = aAssumeVScroll ? vScrollbarMinSize.height : 0;
 
+  nsSize hScrollbarMinSize(0, 0);
   nsSize hScrollbarPrefSize(0, 0);
   if (mHelper.mHScrollbarBox) {
     GetScrollbarMetrics(aState->mBoxState, mHelper.mHScrollbarBox,
-                        nullptr,
+                        &hScrollbarMinSize,
                         aAssumeHScroll ? &hScrollbarPrefSize : nullptr);
     nsScrollbarFrame* scrollbar = do_QueryFrame(mHelper.mHScrollbarBox);
     scrollbar->SetScrollbarMediatorContent(mContent);
   }
-
   nscoord hScrollbarDesiredHeight =
       aAssumeHScroll ? hScrollbarPrefSize.height : 0;
+  nscoord hScrollbarMinWidth = aAssumeHScroll ? hScrollbarMinSize.width : 0;
 
   // First, compute our inside-border size and scrollport size
   // XXXldb Can we depend more on ComputeSize here?
   nsSize kidSize = aState->mReflowInput.mStyleDisplay->IsContainSize()
                        ? nsSize(0, 0)
                        : aKidMetrics->PhysicalSize();
   nsSize desiredInsideBorderSize;
-  desiredInsideBorderSize.width = vScrollbarDesiredWidth + kidSize.width;
-  desiredInsideBorderSize.height = hScrollbarDesiredHeight + kidSize.height;
+  desiredInsideBorderSize.width =
+      vScrollbarDesiredWidth + std::max(kidSize.width, hScrollbarMinWidth);
+  desiredInsideBorderSize.height =
+      hScrollbarDesiredHeight + std::max(kidSize.height, vScrollbarMinHeight);
   aState->mInsideBorderSize =
       ComputeInsideBorderSize(aState, desiredInsideBorderSize);
 
@@ -499,9 +507,9 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
           aState->mHScrollbar == ShowScrollbar::Always ||
           scrolledRect.XMost() >= visualViewportSize.width + oneDevPixel ||
           scrolledRect.x <= -oneDevPixel;
-      if (wantHScrollbar != aAssumeHScroll) {
-        return false;
-      }
+      if (scrollPortSize.width < hScrollbarMinSize.width)
+        wantHScrollbar = false;
+      if (wantHScrollbar != aAssumeHScroll) return false;
     }
 
     // If the style is HIDDEN then we already know that aAssumeVScroll is false
@@ -510,9 +518,9 @@ bool nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
           aState->mVScrollbar == ShowScrollbar::Always ||
           scrolledRect.YMost() >= visualViewportSize.height + oneDevPixel ||
           scrolledRect.y <= -oneDevPixel;
-      if (wantVScrollbar != aAssumeVScroll) {
-        return false;
-      }
+      if (scrollPortSize.height < vScrollbarMinSize.height)
+        wantVScrollbar = false;
+      if (wantVScrollbar != aAssumeVScroll) return false;
     }
   }
 

layout/xul/test/test_bug563416.html

@@ -10,7 +10,7 @@
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=563416">Mozilla Bug 563416</a>
-<p id="display"><iframe id="test" srcdoc='<textarea style="box-sizing:content-box; overflow: hidden; -moz-appearance:none; height: 0px; padding: 0px;" cols="20" rows="10">hsldkjvmshlkkajskdlfksdjflskdjflskdjflskdjflskdjfddddddddd</textarea>'></iframe></p>
+<p id="display"><iframe id="test" srcdoc='<textarea style="box-sizing:content-box; -moz-appearance:none; height: 0px; padding: 0px;" cols="20" rows="10">hsldkjvmshlkkajskdlfksdjflskdjflskdjflskdjflskdjfddddddddd</textarea>'></iframe></p>
 <div id="content" style="display: none">
 
 </div>

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

@@ -1,3 +1,4 @@
 [contain-size-flexbox-002.html]
-  expected: FAIL
+  expected:
+    if (os == "android"): FAIL
   bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1560420

testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html.ini

@@ -0,0 +1,4 @@
+[grid-container-scrollbar-vertical-lr-001.html]
+  expected:
+    if os == "mac": FAIL
+    if (os == 'linux' and os_version == '18.04'): FAIL # Bug 1601497

testing/web-platform/meta/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html.ini

@@ -0,0 +1,4 @@
+[grid-container-scrollbar-vertical-rl-001.html]
+  expected:
+    if os == "mac": FAIL
+    if (os == 'linux' and os_version == '18.04'): FAIL # Bug 1601500

testing/web-platform/tests/css/css-overflow/scrollbar-empty-001.html

@@ -9,7 +9,7 @@
   .container { width:100px; }
 </style>
 <p>There should be a blue rectangle below, and possibly a scrollbar (depending
-  on OS / browser), that should not obscure any parts of the rectangle. The
+  on OS / browser), that shouldn not obscure any parts of the rectangle. The
   word "FAIL" should not be seen.</p>
 <div class="container" style="overflow:auto; height:200px;">
   <div id="child" style="display:inline-block; box-sizing:border-box; width:100%; height:100%; border:10px solid blue;"></div>