Changeset 104313 in webkit

Timestamp:

Jan 6, 2012 12:05:06 PM (12 years ago)

Author:

tony@chromium.org

Message:

Need to relayout when stretching the height of a flex item
​https://bugs.webkit.org/show_bug.cgi?id=75661

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/flexbox/flex-align-stretch.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computePreferredMainAxisExtent): Always clear the override size since
it may be set when aligning.
(WebCore::RenderFlexibleBox::alignChildren): Only relayout if the height changed.

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-06  Tony Chang  <tony@chromium.org>
+
+        Need to relayout when stretching the height of a flex item
+        https://bugs.webkit.org/show_bug.cgi?id=75661
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/flex-align-stretch-expected.txt: Added.
+        * css3/flexbox/flex-align-stretch.html: Added.
+
 2012-01-06  Dmitry Lomov  <dslomov@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-06  Tony Chang  <tony@chromium.org>
+
+        Need to relayout when stretching the height of a flex item
+        https://bugs.webkit.org/show_bug.cgi?id=75661
+
+        Reviewed by Ojan Vafai.
+
+        Test: css3/flexbox/flex-align-stretch.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::computePreferredMainAxisExtent): Always clear the override size since
+        it may be set when aligning.
+        (WebCore::RenderFlexibleBox::alignChildren): Only relayout if the height changed.
+
 2012-01-06  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -489 +489 @@
     LayoutUnit flexboxAvailableContentExtent = mainAxisContentExtent();
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
+        child->clearOverrideSize();
         if (mainAxisLengthForChild(child).isAuto()) {
-            child->clearOverrideSize();
             if (!relayoutChildren)
                 child->setChildNeedsLayout(true);
@@ -699 +699 @@
         case AlignStretch: {
             if (!isColumnFlow() && child->style()->logicalHeight().isAuto()) {
+                LayoutUnit logicalHeightBefore = child->logicalHeight();
                 LayoutUnit stretchedLogicalHeight = child->logicalHeight() + RenderFlexibleBox::availableAlignmentSpaceForChild(child);
                 child->setLogicalHeight(stretchedLogicalHeight);
                 child->computeLogicalHeight();
-                // FIXME: We need to relayout if the height changed.
+
+                if (child->logicalHeight() != logicalHeightBefore) {
+                    child->setOverrideHeight(child->logicalHeight());
+                    child->setLogicalHeight(0);
+                    child->setChildNeedsLayout(true);
+                    child->layoutIfNeeded();
+                }
             }
             break;