Changeset 145736 in webkit

Timestamp:

Mar 13, 2013 12:28:59 PM (11 years ago)

Author:

tony@chromium.org

Message:

Regression(r143542): -webkit-align-items: center with overflow: auto/scroll has extra bottom padding
​https://bugs.webkit.org/show_bug.cgi?id=112047

Reviewed by Ojan Vafai.

Source/WebCore:

Add a new pass for computing the client bottom edge that runs after we've repositioned children
due to wrap-reverse, flex-end or vertical centering.

Test: css3/flexbox/negative-overflow.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock): Remove the code to use clientLogicalBottom() that was computed before
repositioning. The repositioning can change the edge.
(WebCore::RenderFlexibleBox::clientLogicalBottomAfterRepositioning): Compute the new bottom based on the final position
of flex items.

• rendering/RenderFlexibleBox.h:

(RenderFlexibleBox):

LayoutTests:

• css3/flexbox/negative-overflow-expected.txt: Added.
• css3/flexbox/negative-overflow.html: Added.
• resources/check-layout.js: Add attributes for checking scroll width and scroll height.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/negative-overflow-expected.txt (added)
• LayoutTests/css3/flexbox/negative-overflow.html (added)
• LayoutTests/resources/check-layout.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-13  Tony Chang  <tony@chromium.org>
+
+        Regression(r143542): -webkit-align-items: center with overflow: auto/scroll has extra bottom padding
+        https://bugs.webkit.org/show_bug.cgi?id=112047
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/negative-overflow-expected.txt: Added.
+        * css3/flexbox/negative-overflow.html: Added.
+        * resources/check-layout.js: Add attributes for checking scroll width and scroll height.
+
 2013-03-13  Nate Chapin  <japhet@chromium.org>
 

trunk/LayoutTests/resources/check-layout.js

@@ -61 +61 @@
         if (node.clientHeight != parseInt(expectedHeight))
             failures.push("Expected " + expectedHeight + " for clientHeight, but got " + node.clientHeight + ". ");
+    }
+
+    var expectedWidth = node.getAttribute && node.getAttribute("data-expected-scroll-width");
+    if (expectedWidth) {
+        if (node.scrollWidth != parseInt(expectedWidth))
+            failures.push("Expected " + expectedWidth + " for scrollWidth, but got " + node.scrollWidth + ". ");
+    }
+
+    var expectedHeight = node.getAttribute && node.getAttribute("data-expected-scroll-height");
+    if (expectedHeight) {
+        if (node.scrollHeight != parseInt(expectedHeight))
+            failures.push("Expected " + expectedHeight + " for scrollHeight, but got " + node.scrollHeight + ". ");
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-13  Tony Chang  <tony@chromium.org>
+
+        Regression(r143542): -webkit-align-items: center with overflow: auto/scroll has extra bottom padding
+        https://bugs.webkit.org/show_bug.cgi?id=112047
+
+        Reviewed by Ojan Vafai.
+
+        Add a new pass for computing the client bottom edge that runs after we've repositioned children
+        due to wrap-reverse, flex-end or vertical centering.
+
+        Test: css3/flexbox/negative-overflow.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Remove the code to use clientLogicalBottom() that was computed before
+        repositioning. The repositioning can change the edge.
+        (WebCore::RenderFlexibleBox::clientLogicalBottomAfterRepositioning): Compute the new bottom based on the final position
+        of flex items.
+        * rendering/RenderFlexibleBox.h:
+        (RenderFlexibleBox):
+
 2013-03-13  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -356 +356 @@
     layoutFlexItems(relayoutChildren, lineContexts);
 
-    LayoutUnit oldClientAfterEdge = clientLogicalBottom();
     updateLogicalHeight();
     repositionLogicalHeightDependentFlexItems(lineContexts);
@@ -371 +370 @@
     repaintChildrenDuringLayoutIfMoved(oldChildRects);
     // FIXME: css3/flexbox/repaint-rtl-column.html seems to repaint more overflow than it needs to.
-    computeOverflow(oldClientAfterEdge);
+    computeOverflow(clientLogicalBottomAfterRepositioning());
     statePusher.pop();
 
@@ -434 +433 @@
     // direction:rtl + flex-direction:column means the cross-axis direction is flipped.
     flipForRightToLeftColumn();
+}
+
+LayoutUnit RenderFlexibleBox::clientLogicalBottomAfterRepositioning()
+{
+    LayoutUnit maxChildLogicalBottom = 0;
+    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+        if (child->isOutOfFlowPositioned())
+            continue;
+        LayoutUnit childLogicalBottom = logicalTopForChild(child) + logicalHeightForChild(child) + marginAfterForChild(child);
+        maxChildLogicalBottom = std::max(maxChildLogicalBottom, childLogicalBottom);
+    }
+    return std::max(clientLogicalBottom(), maxChildLogicalBottom);
 }
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -147 +147 @@
     bool updateAutoMarginsInCrossAxis(RenderBox* child, LayoutUnit availableAlignmentSpace);
     void repositionLogicalHeightDependentFlexItems(Vector<LineContext>&);
+    LayoutUnit clientLogicalBottomAfterRepositioning();
     void appendChildFrameRects(ChildFrameRects&);
     void repaintChildrenDuringLayoutIfMoved(const ChildFrameRects&);