<!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>[207955] branches/safari-602-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/207955">207955</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-27 00:57:41 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/207930">r207930</a>. rdar://problem/28811881</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">branches/safari-602-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsfastmulticolcrashwhenspannercandidateisoutofflowexpectedtxt">branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsfastmulticolcrashwhenspannercandidateisoutofflowhtml">branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207954 => 207955)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-27 07:45:34 UTC (rev 207954)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-27 07:57:41 UTC (rev 207955)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r207930. rdar://problem/28811881
+
+ 2016-10-26 Zalan Bujtas <zalan@apple.com>
+
+ Ignore out-of-flow siblings when searching for a spanner candidate.
+ https://bugs.webkit.org/show_bug.cgi?id=164042.
+ <rdar://problem/28758456>
+
+ Reviewed by Simon Fraser.
+
+ * fast/multicol/crash-when-spanner-candidate-is-out-of-flow-expected.txt: Added.
+ * fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html: Added.
+
</ins><span class="cx"> 2016-10-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r207523. rdar://problem/28718748
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastmulticolcrashwhenspannercandidateisoutofflowexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow-expected.txt (0 => 207955)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow-expected.txt 2016-10-27 07:57:41 UTC (rev 207955)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+Pass if no crash.
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfastmulticolcrashwhenspannercandidateisoutofflowhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html (0 => 207955)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html 2016-10-27 07:57:41 UTC (rev 207955)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that find the proper spanner in flow when out-of-flow elements are present.</title>
+<style>
+.multiCol {
+ column-count: 2;
+ position: absolute;
+}
+
+.spanner {
+ column-span: all;
+}
+</style>
+</head>
+<body class=multiCol>
+ <svg xmlns="http://www.w3.org/2000/svg">
+ <foreignobject class=multiCol>
+ <div class=multiCol><br></div>
+ <div class=spanner>Pass if no crash.</div>
+ </foreignobject>
+ </svg>
+</body>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ setTimeout(function() {
+ document.body.style.columnCount = "unset";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+</script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207954 => 207955)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-27 07:45:34 UTC (rev 207954)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-27 07:57:41 UTC (rev 207955)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-10-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r207930. rdar://problem/28811881
+
+ 2016-10-26 Zalan Bujtas <zalan@apple.com>
+
+ Ignore out-of-flow siblings when searching for a spanner candidate.
+ https://bugs.webkit.org/show_bug.cgi?id=164042.
+ <rdar://problem/28758456>
+
+ Reviewed by Simon Fraser.
+
+ While searching for the spanner candidates in a flow thread, we have to take into account
+ whether renderers are in- or out-of-flow.
+ What it means is that while traversing the renderer tree to find the the candidate
+ renderer (next sibling/ancestor's next child in pre-order traversal), we have to check if the candidate
+ is in the same layout context too.
+
+ Test: fast/multicol/crash-when-spanner-candidate-is-out-of-flow.html
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::spannerPlacehoderCandidate):
+ (WebCore::RenderMultiColumnFlowThread::processPossibleSpannerDescendant):
+
</ins><span class="cx"> 2016-10-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r207708. rdar://problem/28962914
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (207954 => 207955)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-10-27 07:45:34 UTC (rev 207954)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-10-27 07:57:41 UTC (rev 207955)
</span><span class="lines">@@ -270,10 +270,34 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RenderObject* spannerPlacehoderCandidate(const RenderObject& renderer, const RenderMultiColumnFlowThread& stayWithin)
+{
+ // Spanner candidate is a next sibling/ancestor's next child within the flow thread and
+ // it is in the same inflow/out-of-flow layout context.
+ if (renderer.isOutOfFlowPositioned())
+ return nullptr;
+
+ ASSERT(renderer.isDescendantOf(&stayWithin));
+ auto* current = &renderer;
+ while (true) {
+ // Skip to the first in-flow sibling.
+ auto* nextSibling = current->nextSibling();
+ while (nextSibling && nextSibling->isOutOfFlowPositioned())
+ nextSibling = nextSibling->nextSibling();
+ if (nextSibling)
+ return nextSibling;
+ // No sibling candidate, jump to the parent and check its siblings.
+ current = current->parent();
+ if (!current || current == &stayWithin || current->isOutOfFlowPositioned())
+ return nullptr;
+ }
+ return nullptr;
+}
+
</ins><span class="cx"> RenderObject* RenderMultiColumnFlowThread::processPossibleSpannerDescendant(RenderObject*& subtreeRoot, RenderObject* descendant)
</span><span class="cx"> {
</span><span class="cx"> RenderBlockFlow* multicolContainer = multiColumnBlockFlow();
</span><del>- RenderObject* nextRendererInFlowThread = descendant->nextInPreOrderAfterChildren(this);
</del><ins>+ RenderObject* nextRendererInFlowThread = spannerPlacehoderCandidate(*descendant, *this);
</ins><span class="cx"> RenderObject* insertBeforeMulticolChild = nullptr;
</span><span class="cx"> RenderObject* nextDescendant = descendant;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>