<!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>[198574] 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/198574">198574</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-22 20:28:09 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>userSpaceOnUse patterns are not stroked for empty object bounding box elements
https://bugs.webkit.org/show_bug.cgi?id=109758
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2016-03-22
Reviewed by Brent Fulgham.
Source/WebCore:
Checking whether the patternUnits is objectBoundingBox needs to be done
after calling collectPatternAttributes(). Otherwise the default value
will be always checked which is 'objectBoundingBox'.
Tests: svg/custom/pattern-units-fill-stroke.svg
* rendering/svg/RenderSVGResourcePattern.cpp:
(WebCore::RenderSVGResourcePattern::buildPattern):
(WebCore::RenderSVGResourcePattern::applyResource):
LayoutTests:
Ensure the SVG pattern is drawn correctly if it is used as a stroke for
empty objectBoundingBox elements.
* svg/custom/pattern-units-fill-stroke-expected.svg: Added.
* svg/custom/pattern-units-fill-stroke.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="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustompatternunitsfillstrokeexpectedsvg">trunk/LayoutTests/svg/custom/pattern-units-fill-stroke-expected.svg</a></li>
<li><a href="#trunkLayoutTestssvgcustompatternunitsfillstrokesvg">trunk/LayoutTests/svg/custom/pattern-units-fill-stroke.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198573 => 198574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-23 02:30:57 UTC (rev 198573)
+++ trunk/LayoutTests/ChangeLog 2016-03-23 03:28:09 UTC (rev 198574)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-22 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ userSpaceOnUse patterns are not stroked for empty object bounding box elements
+ https://bugs.webkit.org/show_bug.cgi?id=109758
+
+ Reviewed by Brent Fulgham.
+
+ Ensure the SVG pattern is drawn correctly if it is used as a stroke for
+ empty objectBoundingBox elements.
+
+ * svg/custom/pattern-units-fill-stroke-expected.svg: Added.
+ * svg/custom/pattern-units-fill-stroke.svg: Added.
+
</ins><span class="cx"> 2016-03-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Post-review test update after r198560
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustompatternunitsfillstrokeexpectedsvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/pattern-units-fill-stroke-expected.svg (0 => 198574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/pattern-units-fill-stroke-expected.svg (rev 0)
+++ trunk/LayoutTests/svg/custom/pattern-units-fill-stroke-expected.svg 2016-03-23 03:28:09 UTC (rev 198574)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<svg width='400' height='400' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' >
+ <g id='symbol-16'>
+ <g id='symbol-4'>
+ <g id='symbol-1'>
+ <rect width='50' height='50' fill='skyblue'/>
+ <rect x='5' y='5' width='40' height='40' fill='green'/>
+ </g>
+ <use xlink:href='#symbol-1' transform='translate(50, 0)'/>
+ <use xlink:href='#symbol-1' transform='translate(100, 0)'/>
+ <use xlink:href='#symbol-1' transform='translate(150, 0)'/>
+ </g>
+ <use xlink:href='#symbol-4' transform='translate(0, 50)'/>
+ <use xlink:href='#symbol-4' transform='translate(0, 100)'/>
+ <use xlink:href='#symbol-4' transform='translate(0, 150)'/>
+ </g>
+ <use xlink:href='#symbol-16' transform='translate(200, 0)'/>
+ <use xlink:href='#symbol-16' transform='translate(0, 200)'/>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcustompatternunitsfillstrokesvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/pattern-units-fill-stroke.svg (0 => 198574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/pattern-units-fill-stroke.svg (rev 0)
+++ trunk/LayoutTests/svg/custom/pattern-units-fill-stroke.svg 2016-03-23 03:28:09 UTC (rev 198574)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<svg width='400' height='400' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' >
+ <defs>
+ <symbol id="symbol-1">
+ <rect width='50' height='50' fill='skyblue'/>
+ <rect x='5' y='5' width='40' height='40' fill='green'/>
+ </symbol>
+ <pattern id='pattern-1' width='50' height='50' patternUnits='userSpaceOnUse'>
+ <use width='50' height='50' xlink:href='#symbol-1' />
+ </pattern>
+ <pattern id='pattern-2' x='0' y='0' width='0.25' height='0.25' patternUnits='objectBoundingBox'>
+ <use width='50' height='50' xlink:href='#symbol-1' />
+ </pattern>
+ </defs>
+ <rect x='0' y='0' width='200' height='200' fill='url(#pattern-1)'/>
+ <line x1='200' y1='100' x2='400' y2='100' stroke-width='200' stroke='url(#pattern-1)'/>
+ <rect x='0' y='200' width='200' height='200' fill='url(#pattern-2)'/>
+ <!-- This line won't be drawn since pattern-2 has 'objectBoundingBox' and the line box is empty -->
+ <line x1='200' y1='300' x2='400' y2='300' stroke-width='200' stroke='url(#pattern-2)'/>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198573 => 198574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-23 02:30:57 UTC (rev 198573)
+++ trunk/Source/WebCore/ChangeLog 2016-03-23 03:28:09 UTC (rev 198574)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-22 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ userSpaceOnUse patterns are not stroked for empty object bounding box elements
+ https://bugs.webkit.org/show_bug.cgi?id=109758
+
+ Reviewed by Brent Fulgham.
+
+ Checking whether the patternUnits is objectBoundingBox needs to be done
+ after calling collectPatternAttributes(). Otherwise the default value
+ will be always checked which is 'objectBoundingBox'.
+
+ Tests: svg/custom/pattern-units-fill-stroke.svg
+
+ * rendering/svg/RenderSVGResourcePattern.cpp:
+ (WebCore::RenderSVGResourcePattern::buildPattern):
+ (WebCore::RenderSVGResourcePattern::applyResource):
+
</ins><span class="cx"> 2016-03-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Use references instead of pointers for absolute positioning code
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (198573 => 198574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2016-03-23 02:30:57 UTC (rev 198573)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2016-03-23 03:28:09 UTC (rev 198574)
</span><span class="lines">@@ -71,18 +71,12 @@
</span><span class="cx">
</span><span class="cx"> PatternData* RenderSVGResourcePattern::buildPattern(RenderElement& renderer, unsigned short resourceMode, GraphicsContext& context)
</span><span class="cx"> {
</span><ins>+ ASSERT(!m_shouldCollectPatternAttributes);
+
</ins><span class="cx"> PatternData* currentData = m_patternMap.get(&renderer);
</span><span class="cx"> if (currentData && currentData->pattern)
</span><span class="cx"> return currentData;
</span><span class="cx">
</span><del>- if (m_shouldCollectPatternAttributes) {
- patternElement().synchronizeAnimatedSVGAttribute(anyQName());
-
- m_attributes = PatternAttributes();
- collectPatternAttributes(m_attributes);
- m_shouldCollectPatternAttributes = false;
- }
-
</del><span class="cx"> // If we couldn't determine the pattern content element root, stop here.
</span><span class="cx"> if (!m_attributes.patternContentElement())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -151,6 +145,14 @@
</span><span class="cx"> ASSERT(context);
</span><span class="cx"> ASSERT(resourceMode != ApplyToDefaultMode);
</span><span class="cx">
</span><ins>+ if (m_shouldCollectPatternAttributes) {
+ patternElement().synchronizeAnimatedSVGAttribute(anyQName());
+
+ m_attributes = PatternAttributes();
+ collectPatternAttributes(m_attributes);
+ m_shouldCollectPatternAttributes = false;
+ }
+
</ins><span class="cx"> // Spec: When the geometry of the applicable element has no width or height and objectBoundingBox is specified,
</span><span class="cx"> // then the given effect (e.g. a gradient or a filter) will be ignored.
</span><span class="cx"> FloatRect objectBoundingBox = renderer.objectBoundingBox();
</span></span></pre>
</div>
</div>
</body>
</html>