Changeset 167541 in webkit

Timestamp:

Apr 19, 2014, 11:57:46 AM (12 years ago)

Author:

Darin Adler

Message:

[CSS Regions] Harden the layout in case there are no regions
​https://bugs.webkit.org/show_bug.cgi?id=131517

Patch by Andrei Bucur <​abucur@adobe.com> on 2014-04-19
Reviewed by Mihnea Ovidenie.

Source/WebCore:
The patch fixes the cases when the content of a flow thread is not
properly invalidated when all the regions of its chain are removed.

Test: fast/regions/simplified-layout-no-regions.html

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::ensureOverflowForBox):

LayoutTests:
Add a test that verifies the content of a flow thread is updated when all
the regions are removed.

• fast/regions/simplified-layout-no-regions-expected.txt: Added.
• fast/regions/simplified-layout-no-regions.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/simplified-layout-no-regions-expected.txt (added)
• LayoutTests/fast/regions/simplified-layout-no-regions.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-19  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Harden the layout in case there are no regions
+        https://bugs.webkit.org/show_bug.cgi?id=131517
+
+        Reviewed by Mihnea Ovidenie.
+
+        Add a test that verifies the content of a flow thread is updated when all
+        the regions are removed.
+
+        * fast/regions/simplified-layout-no-regions-expected.txt: Added.
+        * fast/regions/simplified-layout-no-regions.html: Added.
+
 2014-04-19  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-19  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Harden the layout in case there are no regions
+        https://bugs.webkit.org/show_bug.cgi?id=131517
+
+        Reviewed by Mihnea Ovidenie.
+
+        The patch fixes the cases when the content of a flow thread is not
+        properly invalidated when all the regions of its chain are removed.
+
+        Test: fast/regions/simplified-layout-no-regions.html
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::ensureOverflowForBox):
+
 2014-04-19  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -591 +591 @@
 void RenderFlowThread::logicalWidthChangedInRegionsForBlock(const RenderBlock* block, bool& relayoutChildren)
 {
-    if (!hasValidRegionInfo())
-        return;
+    if (!hasValidRegionInfo()) {
+        // FIXME: Remove once we stop laying out flow threads without regions.
+        // If we had regions but don't any more, relayout the children because the code below
+        // can't properly detect this scenario.
+        relayoutChildren |= previousRegionCountChanged();
+        return;
+    }
 
     auto it = m_regionRangeMap.find(block);

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -431 +431 @@
 void RenderRegion::ensureOverflowForBox(const RenderBox* box, RefPtr<RenderOverflow>& overflow, bool forceCreation)
 {
+    ASSERT(m_flowThread->renderRegionList().contains(this));
     ASSERT(isValid());