<!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>[163618] 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/163618">163618</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-07 02:44:10 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Vector-effect updates require a re-layout
https://bugs.webkit.org/show_bug.cgi?id=127553
Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2014-02-07
Reviewed by Andreas Kling.
As noted in the stale SVGRenderStyle::diff() comment, now that layout() observes vector-effect
we need to trigger a re-layout on attribute changes.
Merged from Blink: https://src.chromium.org/viewvc/blink?revision=152570&view=revision
Source/WebCore:
Tests: svg/custom/non-scaling-stroke-update-expected.svg
svg/custom/non-scaling-stroke-update.svg
* rendering/style/SVGRenderStyle.cpp:
(WebCore::SVGRenderStyle::diff):
LayoutTests:
* svg/custom/non-scaling-stroke-update-expected.svg: Added.
* svg/custom/non-scaling-stroke-update.svg: 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="#trunkSourceWebCorerenderingstyleSVGRenderStylecpp">trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustomnonscalingstrokeupdateexpectedsvg">trunk/LayoutTests/svg/custom/non-scaling-stroke-update-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgcustomnonscalingstrokeupdatesvg">trunk/LayoutTests/svg/custom/non-scaling-stroke-update.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163617 => 163618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-07 10:21:15 UTC (rev 163617)
+++ trunk/LayoutTests/ChangeLog 2014-02-07 10:44:10 UTC (rev 163618)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-07 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
+
+ Vector-effect updates require a re-layout
+ https://bugs.webkit.org/show_bug.cgi?id=127553
+
+ Reviewed by Andreas Kling.
+
+ As noted in the stale SVGRenderStyle::diff() comment, now that layout() observes vector-effect
+ we need to trigger a re-layout on attribute changes.
+
+ Merged from Blink: https://src.chromium.org/viewvc/blink?revision=152570&view=revision
+
+ * svg/custom/non-scaling-stroke-update-expected.svg: Added.
+ * svg/custom/non-scaling-stroke-update.svg: Added.
+
</ins><span class="cx"> 2014-02-07 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK port gardening
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomnonscalingstrokeupdateexpectedsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/non-scaling-stroke-update-expected.svg (0 => 163618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/non-scaling-stroke-update-expected.svg (rev 0)
+++ trunk/LayoutTests/svg/custom/non-scaling-stroke-update-expected.svg 2014-02-07 10:44:10 UTC (rev 163618)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="runTest()">
+ <g transform="scale(4)">
+ <rect id="rect" x="25" y="25" width="25" height="25" fill="green" stroke-width="1" stroke="black" vector-effect="non-scaling-stroke"/>
+ </g>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcustomnonscalingstrokeupdatesvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/non-scaling-stroke-update.svg (0 => 163618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/non-scaling-stroke-update.svg (rev 0)
+++ trunk/LayoutTests/svg/custom/non-scaling-stroke-update.svg 2014-02-07 10:44:10 UTC (rev 163618)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Test for crbug.com/250001 -->
+ <g transform="scale(4)">
+ <rect id="clear_rect" width="100%" height="100%"/>
+ <rect id="rect" x="25" y="25" width="25" height="25" fill="green" stroke-width="1" stroke="black"/>
+ </g>
+
+ <script>
+ if (window.testRunner) {
+ testRunner.display();
+ testRunner.waitUntilDone();
+ setTimeout(runTest, 0);
+ } else {
+ setTimeout(runTest, 200);
+ }
+
+ function runTest() {
+document.getElementById('clear_rect').setAttribute('fill', 'white');
+document.getElementById('rect').setAttribute('vector-effect', 'non-scaling-stroke');
+if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ </script>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163617 => 163618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-07 10:21:15 UTC (rev 163617)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 10:44:10 UTC (rev 163618)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-07 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
+
+ Vector-effect updates require a re-layout
+ https://bugs.webkit.org/show_bug.cgi?id=127553
+
+ Reviewed by Andreas Kling.
+
+ As noted in the stale SVGRenderStyle::diff() comment, now that layout() observes vector-effect
+ we need to trigger a re-layout on attribute changes.
+
+ Merged from Blink: https://src.chromium.org/viewvc/blink?revision=152570&view=revision
+
+ Tests: svg/custom/non-scaling-stroke-update-expected.svg
+ svg/custom/non-scaling-stroke-update.svg
+
+ * rendering/style/SVGRenderStyle.cpp:
+ (WebCore::SVGRenderStyle::diff):
+
</ins><span class="cx"> 2014-02-07 Laszlo Vidacs <lvidacs.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Renaming isTableElement() to isRenderedTable() as per the FIXME comment
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleSVGRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp (163617 => 163618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp 2014-02-07 10:21:15 UTC (rev 163617)
+++ trunk/Source/WebCore/rendering/style/SVGRenderStyle.cpp 2014-02-07 10:44:10 UTC (rev 163618)
</span><span class="lines">@@ -202,6 +202,10 @@
</span><span class="cx"> return StyleDifferenceRepaint;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // vector-effect changes require a re-layout.
+ if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.f._vectorEffect)
+ return StyleDifferenceLayout;
+
</ins><span class="cx"> // NOTE: All comparisions below may only return StyleDifferenceRepaint
</span><span class="cx">
</span><span class="cx"> // Painting related properties only need repaints.
</span><span class="lines">@@ -230,10 +234,6 @@
</span><span class="cx"> || svg_inherited_flags._colorInterpolationFilters != other->svg_inherited_flags._colorInterpolationFilters)
</span><span class="cx"> return StyleDifferenceRepaint;
</span><span class="cx">
</span><del>- // FIXME: vector-effect is not taken into account in the layout-phase. Once this is fixed, we should relayout here.
- if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.f._vectorEffect)
- return StyleDifferenceRepaint;
-
</del><span class="cx"> if (svg_noninherited_flags.f.bufferedRendering != other->svg_noninherited_flags.f.bufferedRendering)
</span><span class="cx"> return StyleDifferenceRepaint;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>