Changeset 201218 in webkit

Timestamp:

May 20, 2016 11:48:53 AM (8 years ago)

Author:

hyatt@apple.com

Message:

Scrolling broken in iTunes connect pages
​https://bugs.webkit.org/show_bug.cgi?id=157678

Reviewed by Zalan Bujtas.

Source/WebCore:

Added fast/flexbox/nested-columns-min-intrinsic-disabled.html

Turn off minimum intrinsic size adjustment for flexboxes. This violates the spec,
but until we can produce good results that is what we need to do. Blink has also
turned off nested columns intrinsic sizing as well, so we match them with this
change.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):

LayoutTests:

• fast/flexbox/nested-column-intrinsic-min-disabled-expected.html: Added.
• fast/flexbox/nested-column-intrinsic-min-disabled.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html (added)
• LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-20  Dave Hyatt  <hyatt@apple.com>
+
+        Scrolling broken in iTunes connect pages
+        https://bugs.webkit.org/show_bug.cgi?id=157678
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/flexbox/nested-column-intrinsic-min-disabled-expected.html: Added.
+        * fast/flexbox/nested-column-intrinsic-min-disabled.html: Added.
+
 2016-05-20  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-20  Dave Hyatt  <hyatt@apple.com>
+
+        Scrolling broken in iTunes connect pages
+        https://bugs.webkit.org/show_bug.cgi?id=157678
+
+        Reviewed by Zalan Bujtas.
+
+        Added fast/flexbox/nested-columns-min-intrinsic-disabled.html
+
+        Turn off minimum intrinsic size adjustment for flexboxes. This violates the spec,
+        but until we can produce good results that is what we need to do. Blink has also
+        turned off nested columns intrinsic sizing as well, so we match them with this
+        change.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+
 2016-05-20  Rawinder Singh  <rawinder.singh-webkit@cisra.canon.com.au>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -869 +869 @@
         return std::max(childSize, computeMainAxisExtentForChild(child, MinSize, min).valueOr(childSize));
 
-    if (!isFlexibleBoxImpl() && min.isAuto() && mainAxisOverflowForChild(child) == OVISIBLE) {
+    if (!isFlexibleBoxImpl() && min.isAuto() && mainAxisOverflowForChild(child) == OVISIBLE && !(isColumnFlow() && is<RenderFlexibleBox>(child))) {
         // This is the implementation of CSS flexbox section 4.5 which defines the minimum size of "pure" flex
         // items. For any other item the value should be 0, this also includes RenderFlexibleBox's derived clases
         // (RenderButton, RenderFullScreen...) because that's just an implementation detail.
+        // FIXME: For now we don't handle nested column flexboxes. Need to implement better intrinsic
+        // size handling from the flex box spec first (4.5).
         LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).value();
         ASSERT(contentSize >= 0);