<!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>[180328] 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/180328">180328</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 16:30:10 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/174761">r174761</a>) Dangling spanner pointer in RenderMultiColumnSpannerPlaceholder.
https://bugs.webkit.org/show_bug.cgi?id=138224
Reviewed by Dave Hyatt.
It's wrong to call flowThreadRelativeWillBeRemoved(child).
RenderMultiColumnFlowThread::removeFlowChildInfo() does not mean that the child is actually about to be removed.
Should this introduce any regressions, we need to deal with those separately.
Source/WebCore:
Test: fast/multicol/crash-when-spanner-gets-moved-around.html
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::removeFlowChildInfo): Deleted.
* rendering/RenderMultiColumnFlowThread.h:
LayoutTests:
* fast/multicol/crash-when-spanner-gets-moved-around-expected.txt: Added.
* fast/multicol/crash-when-spanner-gets-moved-around.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="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolcrashwhenspannergetsmovedaroundexpectedtxt">trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolcrashwhenspannergetsmovedaroundhtml">trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180327 => 180328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-19 00:27:35 UTC (rev 180327)
+++ trunk/LayoutTests/ChangeLog 2015-02-19 00:30:10 UTC (rev 180328)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-18 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(r174761) Dangling spanner pointer in RenderMultiColumnSpannerPlaceholder.
+ https://bugs.webkit.org/show_bug.cgi?id=138224
+
+ Reviewed by Dave Hyatt.
+
+ It's wrong to call flowThreadRelativeWillBeRemoved(child).
+ RenderMultiColumnFlowThread::removeFlowChildInfo() does not mean that the child is actually about to be removed.
+ Should this introduce any regressions, we need to deal with those separately.
+
+ * fast/multicol/crash-when-spanner-gets-moved-around-expected.txt: Added.
+ * fast/multicol/crash-when-spanner-gets-moved-around.html: Added.
+
</ins><span class="cx"> 2015-02-18 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Many flakey tests for webkit.org/b/139968 do not appear to be flakey
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolcrashwhenspannergetsmovedaroundexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around-expected.txt (0 => 180328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around-expected.txt 2015-02-19 00:30:10 UTC (rev 180328)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or assert in debug.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolcrashwhenspannergetsmovedaroundhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around.html (0 => 180328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/crash-when-spanner-gets-moved-around.html 2015-02-19 00:30:10 UTC (rev 180328)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<title>This tests if we end up with a dangling spanner pointer in the spanner placeholder object, when the spanner renderer moves around.</title>
+<head>
+<style>
+ .outer {
+ -webkit-column-width: 1px;
+ }
+
+ span:nth-last-child(2) {
+ -webkit-column-span: all;
+ }
+
+ #d1 {
+ -webkit-transform: translateX(10px);
+ -webkit-animation-name: name;
+ -webkit-animation-duration: 10000s;
+ }
+
+ @-webkit-keyframes name {
+ from {}
+ to { -webkit-column-rule: 1vh; }
+ }
+</style>
+</head>
+<body>
+PASS if no crash or assert in debug.
+<div class=outer>
+ <div id=d1>
+ <span style="display: block"></span>
+ <div></div>
+ </div>
+</div>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+ setTimeout(function() {
+ document.getElementById('d1').appendChild(document.createElement('div'));
+ document.body.offsetHeight;
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180327 => 180328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-19 00:27:35 UTC (rev 180327)
+++ trunk/Source/WebCore/ChangeLog 2015-02-19 00:30:10 UTC (rev 180328)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-02-18 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(r174761) Dangling spanner pointer in RenderMultiColumnSpannerPlaceholder.
+ https://bugs.webkit.org/show_bug.cgi?id=138224
+
+ Reviewed by Dave Hyatt.
+
+ It's wrong to call flowThreadRelativeWillBeRemoved(child).
+ RenderMultiColumnFlowThread::removeFlowChildInfo() does not mean that the child is actually about to be removed.
+ Should this introduce any regressions, we need to deal with those separately.
+
+ Test: fast/multicol/crash-when-spanner-gets-moved-around.html
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::removeFlowChildInfo): Deleted.
+ * rendering/RenderMultiColumnFlowThread.h:
+
</ins><span class="cx"> 2015-02-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] CFData leak in CDMSessionAVFoundationCF
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (180327 => 180328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2015-02-19 00:27:35 UTC (rev 180327)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2015-02-19 00:30:10 UTC (rev 180328)
</span><span class="lines">@@ -58,12 +58,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderMultiColumnFlowThread::removeFlowChildInfo(RenderObject* child)
-{
- RenderFlowThread::removeFlowChildInfo(child);
- flowThreadRelativeWillBeRemoved(child);
-}
-
</del><span class="cx"> const char* RenderMultiColumnFlowThread::renderName() const
</span><span class="cx"> {
</span><span class="cx"> return "RenderMultiColumnFlowThread";
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (180327 => 180328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2015-02-19 00:27:35 UTC (rev 180327)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2015-02-19 00:30:10 UTC (rev 180328)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> RenderMultiColumnFlowThread(Document&, Ref<RenderStyle>&&);
</span><span class="cx"> ~RenderMultiColumnFlowThread();
</span><span class="cx">
</span><del>- virtual void removeFlowChildInfo(RenderObject*) override;
-
</del><span class="cx"> RenderBlockFlow* multiColumnBlockFlow() const { return downcast<RenderBlockFlow>(parent()); }
</span><span class="cx">
</span><span class="cx"> RenderMultiColumnSet* firstMultiColumnSet() const;
</span></span></pre>
</div>
</div>
</body>
</html>