<!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>[210339] 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/210339">210339</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 09:08:54 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210035">r210035</a>. rdar://problem/29704862</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="#branchessafari603branchSourceWebCorerenderingRenderObjectcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderObjecth">branches/safari-603-branch/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingsvgRenderSVGBlockh">branches/safari-603-branch/Source/WebCore/rendering/svg/RenderSVGBlock.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfastmulticolsvginsidemulticolumnexpectedtxt">branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfastmulticolsvginsidemulticolumnhtml">branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn.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 (210338 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 17:08:50 UTC (rev 210338)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210035. rdar://problem/29704862
+
+ 2016-12-20 Zalan Bujtas <zalan@apple.com>
+
+ SVG elements should inherit the root's flow thread state.
+ https://bugs.webkit.org/show_bug.cgi?id=166173
+ rdar://problem/29704862
+
+ Reviewed by Simon Fraser.
+
+ * fast/multicol/svg-inside-multicolumn-expected.txt: Added.
+ * fast/multicol/svg-inside-multicolumn.html: Added.
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210033. rdar://problem/29755339
</span><span class="cx">
</span><span class="cx"> 2016-12-20 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastmulticolsvginsidemulticolumnexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn-expected.txt (0 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn-expected.txt 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if no crash or assert.
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfastmulticolsvginsidemulticolumnhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn.html (0 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/multicol/svg-inside-multicolumn.html 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!--======================================================================-->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="svgroot" width="100%" height="100%" viewBox="0 0 480 360">
+ <text fill="black">Pass if no crash or assert.</text>
+<style>
+svg {
+ position: absolute;
+}
+
+body {
+ animation-name: name0;
+ animation-duration: 100s;
+}
+
+@-webkit-keyframes name0 {
+ from {
+ column-width: auto;
+ }
+ to {
+ column-width: 1;
+ }
+}
+
+body:last-child {
+ animation-name: foobar;
+}
+</style>
+
+<script type="text/javascript">
+// <![CDATA[
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.getElementById("svgroot").offsetHeight;
+document.getElementById("svgroot").insertBefore(document.createElementNS("http://www.w3.org/2000/svg", "text"), null);
+// ]]>
+</script>
+</svg>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210338 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:08:50 UTC (rev 210338)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210035. rdar://problem/29704862
+
+ 2016-12-20 Zalan Bujtas <zalan@apple.com>
+
+ SVG elements should inherit the root's flow thread state.
+ https://bugs.webkit.org/show_bug.cgi?id=166173
+ rdar://problem/29704862
+
+ Reviewed by Simon Fraser.
+
+ When the <svg> is not part of the multicolumn context (out of flow positioning), its descendants should not be in the flow either.
+
+ Test: fast/multicol/svg-inside-multicolumn.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::computedFlowThreadState):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::isProgress):
+ (WebCore::RenderObject::isRenderSVGBlock):
+ * rendering/svg/RenderSVGBlock.h:
+
</ins><span class="cx"> 2017-01-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r209990. rdar://problem/29705967
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderObject.cpp (210338 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderObject.cpp 2017-01-05 17:08:50 UTC (rev 210338)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderObject.cpp 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -57,7 +57,11 @@
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderNamedFlowThread.h"
</span><span class="cx"> #include "RenderRuby.h"
</span><ins>+#include "RenderSVGBlock.h"
+#include "RenderSVGInline.h"
+#include "RenderSVGModelObject.h"
</ins><span class="cx"> #include "RenderSVGResourceContainer.h"
</span><ins>+#include "RenderSVGRoot.h"
</ins><span class="cx"> #include "RenderScrollbarPart.h"
</span><span class="cx"> #include "RenderTableRow.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="lines">@@ -185,7 +189,11 @@
</span><span class="cx"> auto inheritedFlowState = RenderObject::NotInsideFlowThread;
</span><span class="cx"> if (is<RenderText>(renderer))
</span><span class="cx"> inheritedFlowState = renderer.parent()->flowThreadState();
</span><del>- else if (auto* containingBlock = renderer.containingBlock())
</del><ins>+ else if (is<RenderSVGBlock>(renderer) || is<RenderSVGInline>(renderer) || is<RenderSVGModelObject>(renderer)) {
+ // containingBlock() skips svg boundary (SVG root is a RenderReplaced).
+ if (auto* svgRoot = SVGRenderSupport::findTreeRootObject(downcast<RenderElement>(renderer)))
+ inheritedFlowState = svgRoot->flowThreadState();
+ } else if (auto* containingBlock = renderer.containingBlock())
</ins><span class="cx"> inheritedFlowState = containingBlock->flowThreadState();
</span><span class="cx"> else {
</span><span class="cx"> // Splitting lines or doing continuation, so just keep the current state.
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderObject.h (210338 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderObject.h 2017-01-05 17:08:50 UTC (rev 210338)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderObject.h 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -243,7 +243,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> virtual bool isSnapshottedPlugIn() const { return false; }
</span><span class="cx"> virtual bool isProgress() const { return false; }
</span><del>- virtual bool isRenderSVGBlock() const { return false; };
</del><span class="cx"> virtual bool isRenderButton() const { return false; }
</span><span class="cx"> virtual bool isRenderIFrame() const { return false; }
</span><span class="cx"> virtual bool isRenderImage() const { return false; }
</span><span class="lines">@@ -351,6 +350,7 @@
</span><span class="cx"> // FIXME: Until all SVG renders can be subclasses of RenderSVGModelObject we have
</span><span class="cx"> // to add SVG renderer methods to RenderObject with an ASSERT_NOT_REACHED() default implementation.
</span><span class="cx"> virtual bool isRenderSVGModelObject() const { return false; }
</span><ins>+ virtual bool isRenderSVGBlock() const { return false; };
</ins><span class="cx"> virtual bool isSVGRoot() const { return false; }
</span><span class="cx"> virtual bool isSVGContainer() const { return false; }
</span><span class="cx"> virtual bool isSVGTransformableContainer() const { return false; }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingsvgRenderSVGBlockh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/svg/RenderSVGBlock.h (210338 => 210339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/svg/RenderSVGBlock.h 2017-01-05 17:08:50 UTC (rev 210338)
+++ branches/safari-603-branch/Source/WebCore/rendering/svg/RenderSVGBlock.h 2017-01-05 17:08:54 UTC (rev 210339)
</span><span class="lines">@@ -50,3 +50,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSVGBlock, isRenderSVGBlock())
</ins></span></pre>
</div>
</div>
</body>
</html>