Changeset 141290 in webkit

Timestamp:

Jan 30, 2013 11:21:26 AM (11 years ago)

Author:

tony@chromium.org

Message:

REGRESSION(r136324): Flexbox should relayout flex children when width changes
​https://bugs.webkit.org/show_bug.cgi?id=108231

Reviewed by Ojan Vafai.

Source/WebCore:

If the width of a block changes, we need to set relayoutChildren = true
to relayout the children. This broke when we optimized the layout calls
in layoutAndPlaceChildren.

Test: css3/flexbox/width-change-and-relayout-children.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock): Also reorder the code to match RenderBlock.
The bug fix is to use updateLogicalWidthAndColumnWidth() and its return value to set
relayoutChildren = true.

LayoutTests:

• css3/flexbox/width-change-and-relayout-children-expected.txt: Added.
• css3/flexbox/width-change-and-relayout-children.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/width-change-and-relayout-children-expected.txt (added)
• LayoutTests/css3/flexbox/width-change-and-relayout-children.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-30  Tony Chang  <tony@chromium.org>
+
+        REGRESSION(r136324): Flexbox should relayout flex children when width changes
+        https://bugs.webkit.org/show_bug.cgi?id=108231
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/width-change-and-relayout-children-expected.txt: Added.
+        * css3/flexbox/width-change-and-relayout-children.html: Added.
+
 2013-01-30  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Tony Chang  <tony@chromium.org>
+
+        REGRESSION(r136324): Flexbox should relayout flex children when width changes
+        https://bugs.webkit.org/show_bug.cgi?id=108231
+
+        Reviewed by Ojan Vafai.
+
+        If the width of a block changes, we need to set relayoutChildren = true
+        to relayout the children. This broke when we optimized the layout calls
+        in layoutAndPlaceChildren.
+
+        Test: css3/flexbox/width-change-and-relayout-children.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Also reorder the code to match RenderBlock.
+        The bug fix is to use updateLogicalWidthAndColumnWidth() and its return value to set
+        relayoutChildren = true.
+
 2013-01-30  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -297 +297 @@
 
     LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
+
+    if (updateLogicalWidthAndColumnWidth())
+        relayoutChildren = true;
+
+    m_overflow.clear();
+
+    LayoutUnit previousHeight = logicalHeight();
+    setLogicalHeight(0);
+
     LayoutStateMaintainer statePusher(view(), this, locationOffset(), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
 
@@ -306 +315 @@
     updateRegionsAndExclusionsLogicalSize();
 
-    LayoutSize previousSize = size();
-
-    setLogicalHeight(0);
-    updateLogicalWidth();
-
     m_numberOfInFlowChildrenOnFirstLine = -1;
-    m_overflow.clear();
 
     RenderBlock::startDelayUpdateScrollInfo();
@@ -331 +334 @@
     RenderBlock::finishDelayUpdateScrollInfo();
 
-    if (size() != previousSize)
+    if (logicalHeight() != previousHeight)
         relayoutChildren = true;