Changeset 100365 in webkit

Timestamp:

Nov 15, 2011 4:29:12 PM (12 years ago)

Author:

ojan@chromium.org

Message:

implement flex-align for flex-flow: column
​https://bugs.webkit.org/show_bug.cgi?id=70754

Reviewed by David Hyatt.

Source/WebCore:

Tests: css3/flexbox/flex-align-column.html

css3/flexbox/line-wrapping.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::sizesToIntrinsicLogicalWidth):
When flexitems are column, they should size to the intrinsic width unless flex-flow is stretch.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::alignChildrenBlockDirection):
This was just using the wrong, non-flow-aware method.

LayoutTests:

• css3/flexbox/flex-align-column-expected.txt: Added.
• css3/flexbox/flex-align-column.html: Added.

Tests the basic flex-align cases with column.

• css3/flexbox/line-wrapping-expected.txt: Added.
• css3/flexbox/line-wrapping.html: Added.

This tests that wrapping inside flexitems uses the correct width.
Notably, auto-sizing properly falls back on the initial containing block.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (2 diffs)
• LayoutTests/css3/flexbox/flex-align-column-expected.txt (added)
• LayoutTests/css3/flexbox/flex-align-column.html (added)
• LayoutTests/css3/flexbox/line-wrapping-expected.txt (added)
• LayoutTests/css3/flexbox/line-wrapping.html (added)
• Source/WebCore/ChangeLog (modified) (2 diffs)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-28  Ojan Vafai  <ojan@chromium.org>
+
+        implement flex-align for flex-flow: column
+        https://bugs.webkit.org/show_bug.cgi?id=70754
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/flex-align-column-expected.txt: Added.
+        * css3/flexbox/flex-align-column.html: Added.
+        Tests the basic flex-align cases with column.
+
+        * css3/flexbox/line-wrapping-expected.txt: Added.
+        * css3/flexbox/line-wrapping.html: Added.
+        This tests that wrapping inside flexitems uses the correct width.
+        Notably, auto-sizing properly falls back on the initial containing block.
+
 2011-11-15  Peter Kasting  <pkasting@google.com>
 
@@ -338 +354 @@
 
         * platform/chromium/test_expectations.txt:
+
+2011-10-28  Ojan Vafai  <ojan@chromium.org>
+
+        Overflow and relayout are broken in the new flexboxes
+        https://bugs.webkit.org/show_bug.cgi?id=71161
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/auto-height-dynamic-expected.txt: Added.
+        * css3/flexbox/auto-height-dynamic.html: Added.
+        * css3/flexbox/flex-item-child-overflow-expected.html: Added.
+        * css3/flexbox/flex-item-child-overflow.html: Added.
 
 2011-10-28  Ojan Vafai  <ojan@chromium.org>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Ojan Vafai  <ojan@chromium.org>
+
+        implement flex-align for flex-flow: column
+        https://bugs.webkit.org/show_bug.cgi?id=70754
+
+        Reviewed by David Hyatt.
+
+        Tests: css3/flexbox/flex-align-column.html
+               css3/flexbox/line-wrapping.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::sizesToIntrinsicLogicalWidth):
+        When flexitems are column, they should size to the intrinsic width unless flex-flow is stretch.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::alignChildrenBlockDirection):
+        This was just using the wrong, non-flow-aware method.
+
 2011-11-15  Jochen Eisinger  <jochen@chromium.org>
 
@@ -138 +156 @@
         (WebCore::PointerLock::create):
         * page/PointerLock.idl: Renamed from Source/WebCore/page/MouseLockable.idl.
+
+2011-10-28  Ojan Vafai  <ojan@chromium.org>
+
+        Overflow and relayout are broken in the new flexboxes
+        https://bugs.webkit.org/show_bug.cgi?id=71161
+
+        Reviewed by David Hyatt.
+
+        Tests: css3/flexbox/auto-height-dynamic.html
+               css3/flexbox/flex-item-child-overflow-expected.html
+               css3/flexbox/flex-item-child-overflow.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        -Always set the logical height to 0 to start with to ensure we don't
+        use the height from the previous layout when we are computing the
+        intrinsic size of the flexbox.
+        -Call computeOverflow after computeLogicalHeight so that flex-item's children's
+        overflow is properly rendered.
+
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection):
+        -Now that we setLogicalHeight in layoutBlock, we no longer need to do it here.
+        -Refactor flipping code. The behavior is the same, but the variable names are just
+        more correct.
 
 2011-10-28  Ojan Vafai  <ojan@chromium.org>

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1801 +1801 @@
             return true;
     }
+
+    if (parent()->isFlexibleBox())
+        return true;
 
     // Flexible horizontal boxes lay out children at their intrinsic widths.  Also vertical boxes

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -722 +722 @@
             if (height.isAuto()) {
                 // FIXME: Clamp to max-height once it's spec'ed (should we align towards the start or center?).
-                LayoutUnit stretchedHeight = logicalHeightForChild(child) + RenderFlexibleBox::availableAlignmentSpaceForChild(child);
+                LayoutUnit stretchedHeight = crossAxisExtentForChild(child) + RenderFlexibleBox::availableAlignmentSpaceForChild(child);
                 if (isHorizontalFlow())
                     child->setHeight(stretchedHeight);