<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195267] releases/WebKitGTK/webkit-2.10</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195267">195267</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-19 01:02:16 -0800 (Tue, 19 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195069">r195069</a> - ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()-&gt;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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBlockFlowcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderFlowThreadcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderFlowThreadh">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderMultiColumnSetcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastmulticolbodystuckwithdirtybitwithcolumnsexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastmulticolbodystuckwithdirtybitwithcolumnshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195266 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2016-01-19 09:00:42 UTC (rev 195266)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-14  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()-&gt;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.
+
</ins><span class="cx"> 2016-01-14  Martin Robinson  &lt;mrobinson@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] [EFL] Hyphenation can never work in practice due to requirements on lang tags
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastmulticolbodystuckwithdirtybitwithcolumnsexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt (0 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt                                (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns-expected.txt        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastmulticolbodystuckwithdirtybitwithcolumnshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html (0 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/multicol/body-stuck-with-dirty-bit-with-columns.html        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+&lt;title&gt;This tests that we don't leave any renderer dirty when layout is done. PASS if no crash or assert in debug.&lt;/title&gt;
+&lt;style&gt;
+*{
+    -webkit-columns: 55px 87;
+    overflow-y: scroll;
+    -webkit-background-composite: source-out;
+    width: 0%;
+}
+*|* {
+    display: inline-flex;
+}
+&lt;/style&gt;
+&lt;summary id=&quot;id_0&quot;&gt;
+    aa
+    &lt;progress&gt;&lt;/progress&gt;
+&lt;/summary&gt;
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.waitUntilDone();
+
+setTimeout(function() {
+    if (window.localStorage.stage == 3) {
+        delete window.localStorage.stage;
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.notifyDone();
+        }
+    } else {
+        if (window.localStorage.stage)
+                window.localStorage.stage++;
+        else
+                window.localStorage.stage = 1;
+        window.scrollTo(0,document.body.scrollHeight);
+        v_0 = document.getElementById('id_0');
+        v_0.removeChild(v_0.childNodes[0]);
+        location.reload();
+    }
+}, 0);
+&lt;/script&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195266 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-19 09:00:42 UTC (rev 195266)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-14  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()-&gt;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):
+
</ins><span class="cx"> 2016-01-14  Martin Robinson  &lt;mrobinson@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] [EFL] Hyphenation can never work in practice due to requirements on lang tags
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlockFlow.cpp (195266 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlockFlow.cpp        2016-01-19 09:00:42 UTC (rev 195266)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBlockFlow.cpp        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -3755,7 +3755,7 @@
</span><span class="cx">         for (RenderMultiColumnSet* columnSet = flowThread-&gt;firstMultiColumnSet(); columnSet; columnSet = columnSet-&gt;nextSiblingMultiColumnSet())
</span><span class="cx">             columnSet-&gt;prepareForLayout(!flowThread-&gt;inBalancingPass());
</span><span class="cx"> 
</span><del>-        flowThread-&gt;invalidateRegions();
</del><ins>+        flowThread-&gt;invalidateRegions(MarkOnlyThis);
</ins><span class="cx">         flowThread-&gt;setNeedsHeightsRecalculation(true);
</span><span class="cx">         flowThread-&gt;layout();
</span><span class="cx">     } else {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.cpp (195266 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.cpp        2016-01-19 09:00:42 UTC (rev 195266)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.cpp        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">     m_regionList.remove(renderRegion);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderFlowThread::invalidateRegions()
</del><ins>+void RenderFlowThread::invalidateRegions(MarkingBehavior markingParents)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!inFinalLayoutPhase());
</span><span class="cx"> 
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">     if (m_lineToRegionMap)
</span><span class="cx">         m_lineToRegionMap-&gt;clear();
</span><span class="cx">     m_layersToRegionMappingsDirty = true;
</span><del>-    setNeedsLayout();
</del><ins>+    setNeedsLayout(markingParents);
</ins><span class="cx"> 
</span><span class="cx">     m_regionsInvalidated = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.h (195266 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.h        2016-01-19 09:00:42 UTC (rev 195266)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderFlowThread.h        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">     virtual void regionChangedWritingMode(RenderRegion*) { }
</span><span class="cx"> 
</span><span class="cx">     void validateRegions();
</span><del>-    void invalidateRegions();
</del><ins>+    void invalidateRegions(MarkingBehavior = MarkContainingBlockChain);
</ins><span class="cx">     bool hasValidRegionInfo() const { return !m_regionsInvalidated &amp;&amp; !m_regionList.isEmpty(); }
</span><span class="cx"> 
</span><span class="cx">     // Some renderers (column spanners) are moved out of the flow thread to live among column
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderMultiColumnSet.cpp (195266 => 195267)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2016-01-19 09:00:42 UTC (rev 195266)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2016-01-19 09:02:16 UTC (rev 195267)
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx">     // Start with &quot;infinite&quot; flow thread portion height until height is known.
</span><span class="cx">     setLogicalBottomInFlowThread(RenderFlowThread::maxLogicalHeight());
</span><span class="cx"> 
</span><del>-    setNeedsLayout();
</del><ins>+    setNeedsLayout(MarkOnlyThis);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderMultiColumnSet::beginFlow(RenderBlock* container)
</span></span></pre>
</div>
</div>

</body>
</html>