<!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>[168016] branches/safari-537.76-branch</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/168016">168016</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 07:12:14 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/167092">r167092</a>. <rdar://problem/16701793></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsChangeLog">branches/safari-537.76-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreChangeLog">branches/safari-537.76-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCorerenderingRenderBlockcpp">branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsfastmulticolfuzzedtestcaseexpectedtxt">branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case-expected.txt</a></li>
<li><a href="#branchessafari53776branchLayoutTestsfastmulticolfuzzedtestcasehtml">branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168015 => 168016)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:08:46 UTC (rev 168015)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:12:14 UTC (rev 168016)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167092
+
+ 2014-04-07 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure, !node || node->isElementNode(), in
+ WebCore::RenderBlock::clone()
+ <https://bugs.webkit.org/show_bug.cgi?id=110489>
+ <rdar://problem/13666425>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/multicol/fuzzed-test-case-expected.txt: Added.
+ * fast/multicol/fuzzed-test-case.html: Added.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r166601
</span><span class="cx">
</span><span class="cx"> 2014-04-01 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastmulticolfuzzedtestcaseexpectedtxtfromrev167092trunkLayoutTestsfastmulticolfuzzedtestcaseexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case-expected.txt (from rev 167092, trunk/LayoutTests/fast/multicol/fuzzed-test-case-expected.txt) (0 => 168016)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case-expected.txt (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case-expected.txt 2014-04-30 14:12:14 UTC (rev 168016)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS
+
</ins></span></pre></div>
<a id="branchessafari53776branchLayoutTestsfastmulticolfuzzedtestcasehtmlfromrev167092trunkLayoutTestsfastmulticolfuzzedtestcasehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case.html (from rev 167092, trunk/LayoutTests/fast/multicol/fuzzed-test-case.html) (0 => 168016)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case.html (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/fast/multicol/fuzzed-test-case.html 2014-04-30 14:12:14 UTC (rev 168016)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<style>
+.c0 { visibility: inherit; -webkit-column-span: all; }
+.c1 { visibility: hidden; float: right; }
+.c1 + .c14 { visibility: collapse; position: fixed; }
+.c4:nth-child(odd) { overflow: inherit; -webkit-column-count: 3; }
+.c4[class~="c4"] { float: none; }
+.c14 { display: compact; -webkit-column-span: all; }
+.c17:nth-of-type(-n+6) { visibility: collapse; -webkit-column-span: all;</style>
+<script>
+
+ /*
+ WebKit bug #110489, <https://bugs.webkit.org/show_bug.cgi?id=110489>. This test passes it if does not assert in a
+ debug build.
+ */
+
+ var nodes = Array();
+ var text = Array();
+ function loaded() {
+ if (window.testRunner) {
+ window.testRunner.dumpAsText();
+ window.testRunner.waitUntilDone();
+ }
+
+ nodes[0] = document.createElement('caption');
+ document.documentElement.appendChild(nodes[0]);
+ nodes[7] = document.createElement('legend');
+ document.documentElement.appendChild(nodes[7]);
+ nodes[11] = document.createElement('aside');
+ document.documentElement.appendChild(nodes[11]);
+ nodes[16] = document.createElement('kbd');
+ document.documentElement.appendChild(nodes[16]);
+ nodes[17] = document.createElement('colgroup');
+ nodes[17].setAttribute('class', 'c1');
+ nodes[18] = document.createElement('bdo');
+ document.documentElement.appendChild(nodes[18]);
+ nodes[37] = document.createElement('header');
+ nodes[37].setAttribute('class', 'c4');
+ document.documentElement.appendChild(nodes[37]);
+ nodes[52] = document.createElement('nav');
+ nodes[52].setAttribute('class', 'c0');
+ nodes[54] = document.createElement('base');
+ nodes[54].setAttribute('class', 'c14');
+ text[13] = document.createTextNode('PASS');
+ nodes[37].appendChild(text[13]);
+ nodes[37].appendChild(nodes[17]);
+ nodes[37].appendChild(nodes[54]);
+ nodes[37].appendChild(nodes[52]);
+ setTimeout('nodes[17].appendChild(nodes[11]);', 0);
+ setTimeout("nodes[17].setAttribute('class', 'c17');", 1);
+
+
+ setTimeout(function() {
+ if (window.testRunner)
+ window.testRunner.notifyDone();
+ }, 2);
+ }
+ window.onload = loaded;
+</script>
</ins></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168015 => 168016)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:08:46 UTC (rev 168015)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:12:14 UTC (rev 168016)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167092
+
+ 2014-04-07 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Assertion failure, !node || node->isElementNode(), in
+ WebCore::RenderBlock::clone()
+ <https://bugs.webkit.org/show_bug.cgi?id=110489>
+ <rdar://problem/13666425>
+
+ Reviewed by Antti Koivisto.
+
+ We're ending up in RenderBlock::splitBlocks() with |this| ==
+ |fromBlock|. We then try to climb the ancestor block chain from
+ this->parent() to |fromBlock|, but this->parent() is already above
+ |fromBlock|, so we end up climbing up to the RenderView and trying to
+ clone it, causing the assertion failure.
+
+ Adopt Chromium's mitigation for this from
+ <https://codereview.chromium.org/13852041>. This is not intended as a
+ fix for the underlying issue.
+
+ Also, fix another issue that occurs with this fuzzed test case that's
+ not handled by the Chromium fix.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::splitBlocks):
+ Ensure while we're in the loop that |curr| is a descendant of
+ |fromBlock|. From the Chromium patch:
+
+ We need to check in every iteration of the loop because
+ moveChildrenTo could have moved |curr|. This is a mitigation and
+ not really a fix against a class of tree craziness.
+
+ Finally, before moving children from |fromBlock| to |toBlock|, ensure
+ that the children are children of |fromBlock|. If we never entered the
+ loop, they will be siblings of |fromBlock|, not children.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r166601
</span><span class="cx">
</span><span class="cx"> 2014-04-01 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.cpp (168015 => 168016)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.cpp 2014-04-30 14:08:46 UTC (rev 168015)
+++ branches/safari-537.76-branch/Source/WebCore/rendering/RenderBlock.cpp 2014-04-30 14:12:14 UTC (rev 168016)
</span><span class="lines">@@ -622,9 +622,7 @@
</span><span class="cx"> RenderBoxModelObject* currChild = this;
</span><span class="cx"> RenderObject* currChildNextSibling = currChild->nextSibling();
</span><span class="cx">
</span><del>- while (curr && curr != fromBlock) {
- ASSERT_WITH_SECURITY_IMPLICATION(curr->isRenderBlock());
-
</del><ins>+ while (curr && curr->isDescendantOf(fromBlock) && curr != fromBlock) {
</ins><span class="cx"> RenderBlock* blockCurr = toRenderBlock(curr);
</span><span class="cx">
</span><span class="cx"> // Create a new clone.
</span><span class="lines">@@ -659,7 +657,8 @@
</span><span class="cx">
</span><span class="cx"> // Now take all the children after currChild and remove them from the fromBlock
</span><span class="cx"> // and put them in the toBlock.
</span><del>- fromBlock->moveChildrenTo(toBlock, currChildNextSibling, 0, true);
</del><ins>+ if (currChildNextSibling && currChildNextSibling->parent() == fromBlock)
+ fromBlock->moveChildrenTo(toBlock, currChildNextSibling, 0, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
</span></span></pre>
</div>
</div>
</body>
</html>