<!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>[164368] 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/164368">164368</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-19 09:58:49 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/163560">r163560</a>): Always treat SVG <tspan> and <textPath> as display inline
https://bugs.webkit.org/show_bug.cgi?id=128552
<rdar://problem/16029658>
Reviewed by Andreas Kling.
Source/WebCore:
Following <http://trac.webkit.org/changeset/163560>, SVG <tspan> and <textPath> may be treated as block-
level elements depending on their CSS styles (e.g. display: block). But such elements should always be
treated as inline-level elements.
Tests: svg/text/textpath-display-block.html
svg/text/textpath-display-none.html
svg/text/tspan-display-block.html
* css/StyleResolver.cpp:
(WebCore::StyleResolver::adjustRenderStyle):
LayoutTests:
Added tests to ensure that SVG <tspan> and <textPath> are always treated as inline-level
elements when explicitly or implicitly specified as a non-none, non-inline display type.
Additionally, added a test to ensure that we don't render a <textPath> when it has CSS
display none. Note, the test LayoutTests/svg/batik/text/textProperties2.svg ensures a
similar behavior for <tspan>.
* svg/text/textpath-display-block-expected.txt: Added.
* svg/text/textpath-display-block.html: Added.
* svg/text/textpath-display-none-expected.html: Added.
* svg/text/textpath-display-none.html: Added.
* svg/text/tspan-display-block-expected.txt: Added.
* svg/text/tspan-display-block.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="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgtexttextpathdisplayblockexpectedtxt">trunk/LayoutTests/svg/text/textpath-display-block-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgtexttextpathdisplayblockhtml">trunk/LayoutTests/svg/text/textpath-display-block.html</a></li>
<li><a href="#trunkLayoutTestssvgtexttextpathdisplaynoneexpectedhtml">trunk/LayoutTests/svg/text/textpath-display-none-expected.html</a></li>
<li><a href="#trunkLayoutTestssvgtexttextpathdisplaynonehtml">trunk/LayoutTests/svg/text/textpath-display-none.html</a></li>
<li><a href="#trunkLayoutTestssvgtexttspandisplayblockexpectedtxt">trunk/LayoutTests/svg/text/tspan-display-block-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgtexttspandisplayblockhtml">trunk/LayoutTests/svg/text/tspan-display-block.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164367 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-19 17:54:31 UTC (rev 164367)
+++ trunk/LayoutTests/ChangeLog 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-02-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r163560): Always treat SVG <tspan> and <textPath> as display inline
+ https://bugs.webkit.org/show_bug.cgi?id=128552
+ <rdar://problem/16029658>
+
+ Reviewed by Andreas Kling.
+
+ Added tests to ensure that SVG <tspan> and <textPath> are always treated as inline-level
+ elements when explicitly or implicitly specified as a non-none, non-inline display type.
+
+ Additionally, added a test to ensure that we don't render a <textPath> when it has CSS
+ display none. Note, the test LayoutTests/svg/batik/text/textProperties2.svg ensures a
+ similar behavior for <tspan>.
+
+ * svg/text/textpath-display-block-expected.txt: Added.
+ * svg/text/textpath-display-block.html: Added.
+ * svg/text/textpath-display-none-expected.html: Added.
+ * svg/text/textpath-display-none.html: Added.
+ * svg/text/tspan-display-block-expected.txt: Added.
+ * svg/text/tspan-display-block.html: Added.
+
+2014-02-19 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Do not dispatch change event twice in single step action
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=116936
</span><span class="cx"> <rdar://problem/16086828>
</span></span></pre></div>
<a id="trunkLayoutTestssvgtexttextpathdisplayblockexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/textpath-display-block-expected.txt (0 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/textpath-display-block-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/text/textpath-display-block-expected.txt 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Tests that a <textPath> with display block doesn't cause an assertion failure.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttextpathdisplayblockhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/textpath-display-block.html (0 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/textpath-display-block.html (rev 0)
+++ trunk/LayoutTests/svg/text/textpath-display-block.html 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<style>
+#textpath { display: block; }
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<p>Tests that a &lt;textPath&gt; with display block doesn't cause an assertion failure.</p>
+<svg>
+ <path id="result-path" d="M 0 20 L 100 20" />
+ <text>
+ <textPath id="textpath" xlink:href="#result-path">PASS</textPath>
+ </text>
+</svg>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttextpathdisplaynoneexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/textpath-display-none-expected.html (0 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/textpath-display-none-expected.html (rev 0)
+++ trunk/LayoutTests/svg/text/textpath-display-none-expected.html 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<style>
+#reference-square {
+ position: relative;
+ top: 20px;
+ width: 100px;
+ height: 100px;
+ background-color: blue;
+}
+</style>
+</head>
+<body>
+<p>Tests that a &lt;textPath&gt; with display none isn't rendered. This test FAILED if you see the word FAIL below. Otherwise, it PASSED.</p>
+<div id="reference-square"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttextpathdisplaynonehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/textpath-display-none.html (0 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/textpath-display-none.html (rev 0)
+++ trunk/LayoutTests/svg/text/textpath-display-none.html 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<style>
+#textpath {
+ display: none;
+}
+svg {
+ height: 200px;
+ width: 200px;
+}
+</style>
+</head>
+<body>
+<p>Tests that a &lt;textPath&gt; with display none isn't rendered. This test FAILED if you see the word FAIL below. Otherwise, it PASSED.</p>
+<svg style="width: 200px; height: 200px">
+ <path id="reference-square" d="M 0 20 L 100 20 L 100 120 L 0 120" fill="blue" />
+ <text>
+ <textPath id="textpath" xlink:href="#reference-square">FAIL FAIL FAIL FAIL FAIL FAIL FAIL FAIL</textPath>
+ </text>
+</svg>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttspandisplayblockexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/tspan-display-block-expected.txt (0 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/tspan-display-block-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/text/tspan-display-block-expected.txt 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Tests that a <tspan> with display block doesn't cause an assertion failure.
+
+PASS
+
</ins></span></pre></div>
<a id="trunkLayoutTestssvgtexttspandisplayblockhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/text/tspan-display-block.html (0 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/text/tspan-display-block.html (rev 0)
+++ trunk/LayoutTests/svg/text/tspan-display-block.html 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<head>
+<style>
+tspan { display: block; }
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<p>Tests that a &lt;tspan&gt; with display block doesn't cause an assertion failure.</p>
+<svg><text x="0" y="20">PA<tspan>S</tspan>S</text></svg>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164367 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-19 17:54:31 UTC (rev 164367)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-02-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r163560): Always treat SVG <tspan> and <textPath> as display inline
+ https://bugs.webkit.org/show_bug.cgi?id=128552
+ <rdar://problem/16029658>
+
+ Reviewed by Andreas Kling.
+
+ Following <http://trac.webkit.org/changeset/163560>, SVG <tspan> and <textPath> may be treated as block-
+ level elements depending on their CSS styles (e.g. display: block). But such elements should always be
+ treated as inline-level elements.
+
+ Tests: svg/text/textpath-display-block.html
+ svg/text/textpath-display-none.html
+ svg/text/tspan-display-block.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::adjustRenderStyle):
+
+2014-02-19 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Do not dispatch change event twice in single step action
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=116936
</span><span class="cx"> <rdar://problem/16086828>
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (164367 => 164368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-19 17:54:31 UTC (rev 164367)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-19 17:58:49 UTC (rev 164368)
</span><span class="lines">@@ -1353,6 +1353,10 @@
</span><span class="cx"> // SVG text layout code expects us to be a block-level style element.
</span><span class="cx"> if ((e->hasTagName(SVGNames::foreignObjectTag) || e->hasTagName(SVGNames::textTag)) && style.isDisplayInlineType())
</span><span class="cx"> style.setDisplay(BLOCK);
</span><ins>+
+ // SVG text layout code expects us to be an inline-level style element.
+ if ((e->hasTagName(SVGNames::tspanTag) || e->hasTagName(SVGNames::textPathTag)) && style.display() != NONE && !style.isDisplayInlineType())
+ style.setDisplay(INLINE);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>