Changeset 195069 in webkit

Timestamp:

Jan 14, 2016 12:09:51 PM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERTION FAILED: !newRelayoutRoot.container()

!newRelayoutRoot.container()->needsLayout() in WebCore::FrameView::scheduleRelayoutOfSubtree

​https://bugs.webkit.org/show_bug.cgi?id=151605#c1

Reviewed by David Hyatt.

Do not let RenderMultiColumnSet/RenderFlowThread mark ancestors dirty while updating scrollbars
for overflow content. While updating scrollbars, we only layout descendants so marking parents dirty
is unnecessary and could lead to an invalid dirty state.

Source/WebCore:

Test: fast/multicol/body-stuck-with-dirty-bit-with-columns.html

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::layoutSpecialExcludedChild):

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::invalidateRegions):

• rendering/RenderFlowThread.h:
• rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::prepareForLayout):

LayoutTests:

• fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt: Added.
• fast/multicol/body-stuck-with-dirty-bit-with-columns.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt (added)
• LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockFlow.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlowThread.h (modified) (1 diff)
• Source/WebCore/rendering/RenderMultiColumnSet.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-14  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout() in WebCore::FrameView::scheduleRelayoutOfSubtree
+        https://bugs.webkit.org/show_bug.cgi?id=151605#c1
+
+        Reviewed by David Hyatt.
+
+        Do not let RenderMultiColumnSet/RenderFlowThread mark ancestors dirty while updating scrollbars
+        for overflow content. While updating scrollbars, we only layout descendants so marking parents dirty
+        is unnecessary and could lead to an invalid dirty state.
+
+        * fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt: Added.
+        * fast/multicol/body-stuck-with-dirty-bit-with-columns.html: Added.
+
 2016-01-14  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-14  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout() in WebCore::FrameView::scheduleRelayoutOfSubtree
+        https://bugs.webkit.org/show_bug.cgi?id=151605#c1
+
+        Reviewed by David Hyatt.
+
+        Do not let RenderMultiColumnSet/RenderFlowThread mark ancestors dirty while updating scrollbars
+        for overflow content. While updating scrollbars, we only layout descendants so marking parents dirty
+        is unnecessary and could lead to an invalid dirty state.
+
+        Test: fast/multicol/body-stuck-with-dirty-bit-with-columns.html
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::layoutSpecialExcludedChild):
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::invalidateRegions):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::prepareForLayout):
+
 2016-01-14  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3767 +3767 @@
             columnSet->prepareForLayout(!flowThread->inBalancingPass());
 
-        flowThread->invalidateRegions();
+        flowThread->invalidateRegions(MarkOnlyThis);
         flowThread->setNeedsHeightsRecalculation(true);
         flowThread->layout();

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -107 +107 @@
 }
 
-void RenderFlowThread::invalidateRegions()
+void RenderFlowThread::invalidateRegions(MarkingBehavior markingParents)
 {
     ASSERT(!inFinalLayoutPhase());
@@ -126 +126 @@
         m_lineToRegionMap->clear();
     m_layersToRegionMappingsDirty = true;
-    setNeedsLayout();
+    setNeedsLayout(markingParents);
 
     m_regionsInvalidated = true;

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -86 +86 @@
 
     void validateRegions();
-    void invalidateRegions();
+    void invalidateRegions(MarkingBehavior = MarkContainingBlockChain);
     bool hasValidRegionInfo() const { return !m_regionsInvalidated && !m_regionList.isEmpty(); }
 

trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

@@ -363 +363 @@
     setLogicalBottomInFlowThread(RenderFlowThread::maxLogicalHeight());
 
-    setNeedsLayout();
+    setNeedsLayout(MarkOnlyThis);
 }