<!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>[195146] 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/195146">195146</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-01-15 13:49:33 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: canHaveChildren() || canHaveGeneratedChildren() in WebCore::RenderElement::insertChildInternal
https://bugs.webkit.org/show_bug.cgi?id=123331
Reviewed by Darin Adler.
Do not set named flow fragment bit on the flow until after the renderer is attached. Setting/resetting it too early
could affect the attach/detach process itself (This is similar to attaching a multi column flow thread).
Source/WebCore:
Test: fast/regions/input-box-with-region-assert.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willBeDestroyed):
(WebCore::RenderBlockFlow::createRenderNamedFlowFragmentIfNeeded):
(WebCore::RenderBlockFlow::setRenderNamedFlowFragment):
LayoutTests:
* fast/regions/input-box-with-region-assert-expected.txt: Added.
* fast/regions/input-box-with-region-assert.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="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsinputboxwithregionassertexpectedtxt">trunk/LayoutTests/fast/regions/input-box-with-region-assert-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionsinputboxwithregionasserthtml">trunk/LayoutTests/fast/regions/input-box-with-region-assert.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195145 => 195146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-15 21:43:57 UTC (rev 195145)
+++ trunk/LayoutTests/ChangeLog 2016-01-15 21:49:33 UTC (rev 195146)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-15 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: canHaveChildren() || canHaveGeneratedChildren() in WebCore::RenderElement::insertChildInternal
+ https://bugs.webkit.org/show_bug.cgi?id=123331
+
+ Reviewed by Darin Adler.
+
+ Do not set named flow fragment bit on the flow until after the renderer is attached. Setting/resetting it too early
+ could affect the attach/detach process itself (This is similar to attaching a multi column flow thread).
+
+ * fast/regions/input-box-with-region-assert-expected.txt: Added.
+ * fast/regions/input-box-with-region-assert.html: Added.
+
</ins><span class="cx"> 2016-01-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Fix some typos in unit tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsinputboxwithregionassertexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/input-box-with-region-assert-expected.txt (0 => 195146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/input-box-with-region-assert-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/input-box-with-region-assert-expected.txt 2016-01-15 21:49:33 UTC (rev 195146)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if no crash or assert in debug.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsinputboxwithregionasserthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/input-box-with-region-assert.html (0 => 195146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/input-box-with-region-assert.html (rev 0)
+++ trunk/LayoutTests/fast/regions/input-box-with-region-assert.html 2016-01-15 21:49:33 UTC (rev 195146)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that flow child can be added to an input element.</title>
+</head>
+<body>
+Pass if no crash or assert in debug.
+<input style="-webkit-flow-from: thread">
+</body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195145 => 195146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-15 21:43:57 UTC (rev 195145)
+++ trunk/Source/WebCore/ChangeLog 2016-01-15 21:49:33 UTC (rev 195146)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-01-15 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: canHaveChildren() || canHaveGeneratedChildren() in WebCore::RenderElement::insertChildInternal
+ https://bugs.webkit.org/show_bug.cgi?id=123331
+
+ Reviewed by Darin Adler.
+
+ Do not set named flow fragment bit on the flow until after the renderer is attached. Setting/resetting it too early
+ could affect the attach/detach process itself (This is similar to attaching a multi column flow thread).
+
+ Test: fast/regions/input-box-with-region-assert.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::willBeDestroyed):
+ (WebCore::RenderBlockFlow::createRenderNamedFlowFragmentIfNeeded):
+ (WebCore::RenderBlockFlow::setRenderNamedFlowFragment):
+
</ins><span class="cx"> 2016-01-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add kdebug_trace signposts for a few WebCore operations
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (195145 => 195146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-01-15 21:43:57 UTC (rev 195145)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-01-15 21:49:33 UTC (rev 195146)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> void RenderBlockFlow::willBeDestroyed()
</span><span class="cx"> {
</span><span class="cx"> if (renderNamedFlowFragment())
</span><del>- setRenderNamedFlowFragment(0);
</del><ins>+ setRenderNamedFlowFragment(nullptr);
</ins><span class="cx">
</span><span class="cx"> // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
</span><span class="cx"> // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
</span><span class="lines">@@ -3151,8 +3151,8 @@
</span><span class="cx"> if (style().isDisplayRegionType() && style().hasFlowFrom() && !style().specifiesColumns()) {
</span><span class="cx"> RenderNamedFlowFragment* flowFragment = new RenderNamedFlowFragment(document(), RenderNamedFlowFragment::createStyle(style()));
</span><span class="cx"> flowFragment->initializeStyle();
</span><ins>+ addChild(flowFragment);
</ins><span class="cx"> setRenderNamedFlowFragment(flowFragment);
</span><del>- addChild(renderNamedFlowFragment());
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3198,8 +3198,8 @@
</span><span class="cx"> void RenderBlockFlow::setRenderNamedFlowFragment(RenderNamedFlowFragment* flowFragment)
</span><span class="cx"> {
</span><span class="cx"> RenderBlockFlowRareData& rareData = ensureRareBlockFlowData();
</span><del>- if (rareData.m_renderNamedFlowFragment)
- rareData.m_renderNamedFlowFragment->destroy();
</del><ins>+ if (auto* flowFragmentOnFlow = std::exchange(rareData.m_renderNamedFlowFragment, nullptr))
+ flowFragmentOnFlow->destroy();
</ins><span class="cx"> rareData.m_renderNamedFlowFragment = flowFragment;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>