<!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>[211518] branches/safari-603-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/211518">211518</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 13:26:37 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211337">r211337</a>. rdar://problem/30126535</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderBlockFlowcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderInlinecpp">branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastmulticolassertoncontinuationwithspannerexpectedtxt">branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastmulticolassertoncontinuationwithspannerhtml">branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211517 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-01 21:26:34 UTC (rev 211517)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211337. rdar://problem/30126535
+
+ 2017-01-28 Zalan Bujtas <zalan@apple.com>
+
+ Resolve beforeChild's render tree position before calling addChildIgnoringContinuation.
+ https://bugs.webkit.org/show_bug.cgi?id=167540
+ <rdar://problem/30126535>
+
+ Reviewed by Simon Fraser.
+
+ * fast/multicol/assert-on-continuation-with-spanner-expected.txt: Added.
+ * fast/multicol/assert-on-continuation-with-spanner.html: Added.
+
+2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211307. rdar://problem/29320059
</span><span class="cx">
</span><span class="cx"> 2017-01-27 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastmulticolassertoncontinuationwithspannerexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt (0 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or assert in debug.
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastmulticolassertoncontinuationwithspannerhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html (0 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<title>This tests that we can insert element when beforeChild has a spanner placeholder</title>
+<style>
+#spanner {
+ column-span: all;
+}
+
+.multicol {
+ display: inline-block;
+ -webkit-columns: 80px 5;
+}
+</style>
+</head>
+<body>
+PASS if no crash or assert in debug.
+<div class=multicol><span><span id=inner></span><div id=spanner></div>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+setTimeout(function() {
+ inner.style.content = "close-quote";
+ spanner.style.float = "left";
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211517 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:34 UTC (rev 211517)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211337. rdar://problem/30126535
+
+ 2017-01-28 Zalan Bujtas <zalan@apple.com>
+
+ Resolve beforeChild's render tree position before calling addChildIgnoringContinuation.
+ https://bugs.webkit.org/show_bug.cgi?id=167540
+ <rdar://problem/30126535>
+
+ Reviewed by Simon Fraser.
+
+ Use the actual render tree position for the beforeChild when inside a flow thread.
+
+ Test: fast/multicol/assert-on-continuation-with-spanner.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::addChild):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::addChild):
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::resolveMovedChild):
+
+2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211309. rdar://problem/30240378
</span><span class="cx">
</span><span class="cx"> 2017-01-27 Michael Saboff <msaboff@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp (211517 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-02-01 21:26:34 UTC (rev 211517)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -3906,11 +3906,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (multiColumnFlowThread())
</span><span class="cx"> return multiColumnFlowThread()->addChild(newChild, beforeChild);
</span><del>- if (beforeChild) {
- if (RenderFlowThread* containingFlowThread = flowThreadContainingBlock())
- beforeChild = containingFlowThread->resolveMovedChild(beforeChild);
- }
- RenderBlock::addChild(newChild, beforeChild);
</del><ins>+ auto* beforeChildOrPlaceholder = beforeChild;
+ if (auto* containingFlowThread = flowThreadContainingBlock())
+ beforeChildOrPlaceholder = containingFlowThread->resolveMovedChild(beforeChild);
+ RenderBlock::addChild(newChild, beforeChildOrPlaceholder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::removeChild(RenderObject& oldChild)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp (211517 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp 2017-02-01 21:26:34 UTC (rev 211517)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderInline.cpp 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -275,9 +275,12 @@
</span><span class="cx">
</span><span class="cx"> void RenderInline::addChild(RenderObject* newChild, RenderObject* beforeChild)
</span><span class="cx"> {
</span><ins>+ auto* beforeChildOrPlaceholder = beforeChild;
+ if (auto* flowThread = flowThreadContainingBlock())
+ beforeChildOrPlaceholder = flowThread->resolveMovedChild(beforeChild);
</ins><span class="cx"> if (continuation())
</span><del>- return addChildToContinuation(newChild, beforeChild);
- return addChildIgnoringContinuation(newChild, beforeChild);
</del><ins>+ return addChildToContinuation(newChild, beforeChildOrPlaceholder);
+ return addChildIgnoringContinuation(newChild, beforeChildOrPlaceholder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RenderBoxModelObject* nextContinuation(RenderObject* renderer)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (211517 => 211518)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2017-02-01 21:26:34 UTC (rev 211517)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2017-02-01 21:26:37 UTC (rev 211518)
</span><span class="lines">@@ -216,6 +216,9 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* RenderMultiColumnFlowThread::resolveMovedChild(RenderObject* child) const
</span><span class="cx"> {
</span><ins>+ if (!child)
+ return nullptr;
+
</ins><span class="cx"> if (child->style().columnSpan() != ColumnSpanAll || !is<RenderBox>(*child)) {
</span><span class="cx"> // We only need to resolve for column spanners.
</span><span class="cx"> return child;
</span></span></pre>
</div>
</div>
</body>
</html>