<!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>[179877] trunk</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/179877">179877</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-10 12:27:40 -0800 (Tue, 10 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/168046">r168046</a>): Crash in WebCore::InlineBox::renderer / WebCore::RenderFlowThread::checkLinesConsistency
https://bugs.webkit.org/show_bug.cgi?id=133462
Reviewed by David Hyatt.
RenderFlowThread::m_lineToRegionMap stores pointers to the root inlineboxes in the block flow.
Normally root inlineboxes remove themselves from this map in their dtors. However when collapsing an anonymous block,
we detach the inline tree first and destroy them after. The detached root boxes can't access
the flowthread containing block and we end up with dangling pointers in this map.
Call removeFlowChildInfo() before detaching the subtree to ensure proper pointer removal.
Source/WebCore:
Test: fast/multicol/newmulticol/crash-when-switching-to-floating.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::collapseAnonymousBoxChild):
LayoutTests:
* fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt: Added.
* fast/multicol/newmulticol/crash-when-switching-to-floating.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolcrashwhenswitchingtofloatingexpectedtxt">trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolcrashwhenswitchingtofloatinghtml">trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179876 => 179877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-10 20:26:50 UTC (rev 179876)
+++ trunk/LayoutTests/ChangeLog 2015-02-10 20:27:40 UTC (rev 179877)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-07 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (r168046): Crash in WebCore::InlineBox::renderer / WebCore::RenderFlowThread::checkLinesConsistency
+ https://bugs.webkit.org/show_bug.cgi?id=133462
+
+ Reviewed by David Hyatt.
+
+ RenderFlowThread::m_lineToRegionMap stores pointers to the root inlineboxes in the block flow.
+ Normally root inlineboxes remove themselves from this map in their dtors. However when collapsing an anonymous block,
+ we detach the inline tree first and destroy them after. The detached root boxes can't access
+ the flowthread containing block and we end up with dangling pointers in this map.
+ Call removeFlowChildInfo() before detaching the subtree to ensure proper pointer removal.
+
+ * fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt: Added.
+ * fast/multicol/newmulticol/crash-when-switching-to-floating.html: Added.
+
</ins><span class="cx"> 2015-02-10 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Gardening: fast/loader/subframe-navigate-during-main-frame-load.html crashes running all tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolcrashwhenswitchingtofloatingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt (0 => 179877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating-expected.txt 2015-02-10 20:27:40 UTC (rev 179877)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if no crash or assert in debug build.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolcrashwhenswitchingtofloatinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html (0 => 179877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/crash-when-switching-to-floating.html 2015-02-10 20:27:40 UTC (rev 179877)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we clean up the inline content properly after introducing floating.</title>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<table><td></table>
+Pass if no crash or assert in debug build.
+<script>
+var head = document.getElementsByTagName("head")[0];
+style = document.createElement("style");
+style.innerHTML="* { \n\
+-webkit-animation-name: name9; \n\
+-webkit-animation-duration: 10s; \n\
+} \n\
+@-webkit-keyframes name9 { \n\
+ from { \n\
+ } \n\
+ to { \n\
+ -webkit-column-width: auto; \n\
+";
+head.appendChild(style);
+document.execCommand("SelectAll");
+style.innerHTML="* {float:left;}";
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179876 => 179877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-10 20:26:50 UTC (rev 179876)
+++ trunk/Source/WebCore/ChangeLog 2015-02-10 20:27:40 UTC (rev 179877)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-07 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (r168046): Crash in WebCore::InlineBox::renderer / WebCore::RenderFlowThread::checkLinesConsistency
+ https://bugs.webkit.org/show_bug.cgi?id=133462
+
+ Reviewed by David Hyatt.
+
+ RenderFlowThread::m_lineToRegionMap stores pointers to the root inlineboxes in the block flow.
+ Normally root inlineboxes remove themselves from this map in their dtors. However when collapsing an anonymous block,
+ we detach the inline tree first and destroy them after. The detached root boxes can't access
+ the flowthread containing block and we end up with dangling pointers in this map.
+ Call removeFlowChildInfo() before detaching the subtree to ensure proper pointer removal.
+
+ Test: fast/multicol/newmulticol/crash-when-switching-to-floating.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::collapseAnonymousBoxChild):
+
</ins><span class="cx"> 2015-02-10 Julien Isorce <j.isorce@samsung.com>
</span><span class="cx">
</span><span class="cx"> Render: properly update body's background image
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (179876 => 179877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-02-10 20:26:50 UTC (rev 179876)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-02-10 20:27:40 UTC (rev 179877)
</span><span class="lines">@@ -672,9 +672,8 @@
</span><span class="cx"> parent.setChildrenInline(child->childrenInline());
</span><span class="cx"> RenderObject* nextSibling = child->nextSibling();
</span><span class="cx">
</span><del>- RenderFlowThread* childFlowThread = child->flowThreadContainingBlock();
- if (is<RenderNamedFlowThread>(childFlowThread))
- downcast<RenderNamedFlowThread>(*childFlowThread).removeFlowChildInfo(child);
</del><ins>+ if (auto* childFlowThread = child->flowThreadContainingBlock())
+ childFlowThread->removeFlowChildInfo(child);
</ins><span class="cx">
</span><span class="cx"> parent.removeChildInternal(*child, child->hasLayer() ? NotifyChildren : DontNotifyChildren);
</span><span class="cx"> child->moveAllChildrenTo(&parent, nextSibling, child->hasLayer());
</span></span></pre>
</div>
</div>
</body>
</html>