<!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>[189307] branches/safari-601-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/189307">189307</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 16:05:13 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187564">r187564</a>. rdar://problem/22316564</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">branches/safari-601-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfastmulticolnewmulticolspannercrashwithembeddedcolumnsexpectedtxt">branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastmulticolnewmulticolspannercrashwithembeddedcolumnshtml">branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (189306 => 189307)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-03 23:03:59 UTC (rev 189306)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-03 23:05:13 UTC (rev 189307)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187564.
+
+ 2015-07-29 Zalan Bujtas <zalan@apple.com>
+
+ Remove the spanner placeholder from m_spannerMap when the placeholder object
+ gets transferred to a descendant flow.
+ https://bugs.webkit.org/show_bug.cgi?id=147380
+ rdar://problem/21981078
+
+ Reviewed by David Hyatt.
+
+ Before r180328, the spanner placeholder was removed from m_spannerMap through
+ RenderMultiColumnFlowThread::removeFlowChildInfo() by calling flowThreadRelativeWillBeRemoved()
+ when the placeholder renderer got transferred to the descendant flow.
+ Now we just remove it from the map when the renderer is being detached.
+
+ * fast/multicol/newmulticol/spanner-crash-with-embedded-columns-expected.txt: Added.
+ * fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html: Added.
+
+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r186984.
</span><span class="cx">
</span><span class="cx"> 2015-07-17 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastmulticolnewmulticolspannercrashwithembeddedcolumnsexpectedtxtfromrev187564trunkLayoutTestsfastmulticolnewmulticolspannercrashwithembeddedcolumnsexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns-expected.txt (from rev 187564, trunk/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns-expected.txt) (0 => 189307)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns-expected.txt 2015-09-03 23:05:13 UTC (rev 189307)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash or assert.
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastmulticolnewmulticolspannercrashwithembeddedcolumnshtmlfromrev187564trunkLayoutTestsfastmulticolnewmulticolspannercrashwithembeddedcolumnshtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html (from rev 187564, trunk/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html) (0 => 189307)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html 2015-09-03 23:05:13 UTC (rev 189307)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that moving a spanner from one flow to another does not end up in a crash.</title>
+<style>
+ html, body {
+ -webkit-column-width: 200px;
+ }
+</style>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+ function runTest() {
+ setTimeout(function() {
+ document.documentElement.style.webkitColumnWidth = "auto";
+ document.body.style.webkitColumnWidth = "auto";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }
+</script>
+</head>
+<body onload="runTest()">
+<div style="-webkit-column-span: all"></div>
+PASS if no crash or assert.
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (189306 => 189307)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-03 23:03:59 UTC (rev 189306)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-09-03 23:05:13 UTC (rev 189307)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187564.
+
+ 2015-07-29 Zalan Bujtas <zalan@apple.com>
+
+ Remove the spanner placeholder from m_spannerMap when the placeholder object
+ gets transferred to a descendant flow.
+ https://bugs.webkit.org/show_bug.cgi?id=147380
+ rdar://problem/21981078
+
+ Reviewed by David Hyatt.
+
+ Before r180328, the spanner placeholder was removed from m_spannerMap through
+ RenderMultiColumnFlowThread::removeFlowChildInfo() by calling flowThreadRelativeWillBeRemoved()
+ when the placeholder renderer got transferred to the descendant flow.
+ Now we just remove it from the map when the renderer is being detached.
+
+ Test: fast/multicol/newmulticol/spanner-crash-with-embedded-columns.html
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::flowThreadDescendantInserted):
+
+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r186984.
</span><span class="cx">
</span><span class="cx"> 2015-07-17 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (189306 => 189307)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2015-09-03 23:03:59 UTC (rev 189306)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2015-09-03 23:05:13 UTC (rev 189307)
</span><span class="lines">@@ -376,10 +376,11 @@
</span><span class="cx">
</span><span class="cx"> // We have to nuke the placeholder, since the ancestor already lost the mapping to it when
</span><span class="cx"> // we shifted the placeholder down into this flow thread.
</span><ins>+ placeholder.flowThread()->m_spannerMap.remove(spanner);
+ placeholder.parent()->removeChild(placeholder);
+
</ins><span class="cx"> if (subtreeRoot == descendant)
</span><span class="cx"> subtreeRoot = spanner;
</span><del>- placeholder.parent()->removeChild(placeholder);
-
</del><span class="cx"> // Now we process the spanner.
</span><span class="cx"> descendant = processPossibleSpannerDescendant(subtreeRoot, spanner);
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
</body>
</html>