Changeset 98628 in webkit

Timestamp:

Oct 27, 2011 1:30:08 PM (13 years ago)

Author:

tony@chromium.org

Message:

fix sizing of auto sized flexbox
​https://bugs.webkit.org/show_bug.cgi?id=70839

Reviewed by David Hyatt.

Source/WebCore:

Correctly set the height of the flexbox when we have a column flow
and the height is auto.

Tests: css3/flexbox/columns-auto-size.html

css3/flexbox/flex-flow-margins-auto-size.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock): Always computeLogicalHeight() after we're done placing children.
(WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection): Set the height as we place children.

LayoutTests:

• css3/flexbox/columns-auto-size-expected.txt: Added.
• css3/flexbox/columns-auto-size.html: Added.
• css3/flexbox/flex-flow-margins-auto-size-expected.txt: Added.
• css3/flexbox/flex-flow-margins-auto-size.html: Added.

A bunch of these cases fail, but that's because of bug 70769.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/columns-auto-size-expected.txt (added)
• LayoutTests/css3/flexbox/columns-auto-size.html (added)
• LayoutTests/css3/flexbox/flex-flow-margins-auto-size-expected.txt (added)
• LayoutTests/css3/flexbox/flex-flow-margins-auto-size.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-27  Tony Chang  <tony@chromium.org>
+
+        fix sizing of auto sized flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=70839
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/columns-auto-size-expected.txt: Added.
+        * css3/flexbox/columns-auto-size.html: Added.
+        * css3/flexbox/flex-flow-margins-auto-size-expected.txt: Added.
+        * css3/flexbox/flex-flow-margins-auto-size.html: Added.
+            A bunch of these cases fail, but that's because of bug 70769.
+
 2011-10-25  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-27  Tony Chang  <tony@chromium.org>
+
+        fix sizing of auto sized flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=70839
+
+        Reviewed by David Hyatt.
+
+        Correctly set the height of the flexbox when we have a column flow
+        and the height is auto.
+
+        Tests: css3/flexbox/columns-auto-size.html
+               css3/flexbox/flex-flow-margins-auto-size.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Always computeLogicalHeight() after we're done placing children.
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection): Set the height as we place children.
+
 2011-10-25  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -184 +184 @@
     layoutInlineDirection(relayoutChildren);
 
-    if (isColumnFlow())
-        computeLogicalWidth();
-    else
-        computeLogicalHeight();
+    computeLogicalHeight();
 
     if (size() != previousSize)
@@ -692 +689 @@
         if (hasPackingSpace(availableFreeSpace, totalPositiveFlexibility) && style()->flexPack() == PackJustify && childSizes.size() > 1)
             startEdge += availableFreeSpace / (childSizes.size() - 1);
-    }
-
+
+        if (isColumnFlow())
+            setLogicalHeight(startEdge);
+    }
     alignChildrenBlockDirection(iterator, maxAscent);
 }