<!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>[180299] branches/safari-600.4.10-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/180299">180299</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 14:35:08 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176750">r176750</a>. rdar://problem/19738583</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari600410branchLayoutTestsChangeLog">branches/safari-600.4.10-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceWebCoreChangeLog">branches/safari-600.4.10-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari600410branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">branches/safari-600.4.10-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari600410branchLayoutTestsfastmulticolsvgcontentascolumnspannercrashexpectedtxt">branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash-expected.txt</a></li>
<li><a href="#branchessafari600410branchLayoutTestsfastmulticolsvgcontentascolumnspannercrashhtml">branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari600410branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/LayoutTests/ChangeLog (180298 => 180299)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/LayoutTests/ChangeLog 2015-02-18 22:28:18 UTC (rev 180298)
+++ branches/safari-600.4.10-branch/LayoutTests/ChangeLog 2015-02-18 22:35:08 UTC (rev 180299)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-18 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176750
+
+ 2014-12-03 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION: RenderMultiColumnFlowThread::processPossibleSpannerDescendant() when column spanner's parent is not a RenderBlockFlow.
+ https://bugs.webkit.org/show_bug.cgi?id=139188
+ rdar://problem/18502182
+
+ Reviewed by David Hyatt.
+
+ This patch ensures that the validation check for spanner in isValidColumnSpanner() is in synch
+ with the expectation in RenderMultiColumnFlowThread::processPossibleSpannerDescendant().
+ (descendant's parent is expected to be a RenderBlockFlow)
+
+ * fast/multicol/svg-content-as-column-spanner-crash-expected.txt: Added.
+ * fast/multicol/svg-content-as-column-spanner-crash.html: Added.
+
+2015-02-18 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r174712
</span><span class="cx">
</span><span class="cx"> 2014-10-14 Dan Bernstein <mitz@apple.com>
</span></span></pre></div>
<a id="branchessafari600410branchLayoutTestsfastmulticolsvgcontentascolumnspannercrashexpectedtxtfromrev176750trunkLayoutTestsfastmulticolsvgcontentascolumnspannercrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash-expected.txt (from rev 176750, trunk/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash-expected.txt) (0 => 180299)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash-expected.txt (rev 0)
+++ branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash-expected.txt 2015-02-18 22:35:08 UTC (rev 180299)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash.
+
</ins></span></pre></div>
<a id="branchessafari600410branchLayoutTestsfastmulticolsvgcontentascolumnspannercrashhtmlfromrev176750trunkLayoutTestsfastmulticolsvgcontentascolumnspannercrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash.html (from rev 176750, trunk/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash.html) (0 => 180299)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash.html (rev 0)
+++ branches/safari-600.4.10-branch/LayoutTests/fast/multicol/svg-content-as-column-spanner-crash.html 2015-02-18 22:35:08 UTC (rev 180299)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 700 200">
+ <g>
+ <text id="text">PASS if no crash.</text>
+ </g>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ document.getElementById("text").setAttribute("style","-webkit-column-span:all;");
+ document.documentElement.setAttribute("style","-webkit-mask-origin:content;overflow:-webkit-paged-y;");
+ </script>
+</svg>
</ins></span></pre></div>
<a id="branchessafari600410branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/ChangeLog (180298 => 180299)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/ChangeLog 2015-02-18 22:28:18 UTC (rev 180298)
+++ branches/safari-600.4.10-branch/Source/WebCore/ChangeLog 2015-02-18 22:35:08 UTC (rev 180299)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-02-18 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176750
+
+ 2014-12-03 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION: RenderMultiColumnFlowThread::processPossibleSpannerDescendant() when column spanner's parent is not a RenderBlockFlow.
+ https://bugs.webkit.org/show_bug.cgi?id=139188
+ rdar://problem/18502182
+
+ Reviewed by David Hyatt.
+
+ This patch ensures that the validation check for spanner in isValidColumnSpanner() is in synch
+ with the expectation in RenderMultiColumnFlowThread::processPossibleSpannerDescendant().
+ (descendant's parent is expected to be a RenderBlockFlow)
+
+ Test: fast/multicol/svg-content-as-column-spanner-crash.html
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::isValidColumnSpanner):
+
+2015-02-18 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r175771
</span><span class="cx">
</span><span class="cx"> 2014-11-07 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari600410branchSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4.10-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (180298 => 180299)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4.10-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2015-02-18 22:28:18 UTC (rev 180298)
+++ branches/safari-600.4.10-branch/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2015-02-18 22:35:08 UTC (rev 180299)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> if (style.columnSpan() != ColumnSpanAll || !descendant->isBox() || descendant->isFloatingOrOutOfFlowPositioned())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderBlock* container = descendant->containingBlock();
</del><ins>+ RenderElement* container = descendant->parent();
</ins><span class="cx"> if (!container->isRenderBlockFlow() || container->childrenInline()) {
</span><span class="cx"> // Needs to be block-level.
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>