<!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>[158903] trunk/Source/WebCore</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/158903">158903</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-11-07 21:24:20 -0800 (Thu, 07 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>RenderSVGResource helpers should take RenderStyle by const reference.
&lt;https://webkit.org/b/124029&gt;

Take const RenderStyle&amp; instead of RenderStyle* in a few more places
so we can get rid of some ampersands and assertions.

Reviewed by Anders Carlsson.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceh">trunk/Source/WebCore/rendering/svg/RenderSVGResource.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapecpp">trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGShapeh">trunk/Source/WebCore/rendering/svg/RenderSVGShape.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/ChangeLog        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-11-07  Andreas Kling  &lt;akling@apple.com&gt;
+
+        RenderSVGResource helpers should take RenderStyle by const reference.
+        &lt;https://webkit.org/b/124029&gt;
+
+        Take const RenderStyle&amp; instead of RenderStyle* in a few more places
+        so we can get rid of some ampersands and assertions.
+
+        Reviewed by Anders Carlsson.
+
</ins><span class="cx"> 2013-11-07  Gyuyoung Kim  &lt;gyuyoung.kim@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [AX] Generate toAccessibilityTableRow|Column|Cell to detect bad type casts
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -50,16 +50,13 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static inline RenderSVGResource* requestPaintingResource(RenderSVGResourceMode mode, RenderElement&amp; object, const RenderStyle* style, Color&amp; fallbackColor)
</del><ins>+static inline RenderSVGResource* requestPaintingResource(RenderSVGResourceMode mode, RenderElement&amp; renderer, const RenderStyle&amp; style, Color&amp; fallbackColor)
</ins><span class="cx"> {
</span><del>-    ASSERT(style);
</del><ins>+    const SVGRenderStyle&amp; svgStyle = style.svgStyle();
</ins><span class="cx"> 
</span><del>-    // If we have no style at all, ignore it.
-    const SVGRenderStyle&amp; svgStyle = style-&gt;svgStyle();
</del><ins>+    bool isRenderingMask = renderer.view().frameView().paintBehavior() &amp; PaintBehaviorRenderingSVGMask;
</ins><span class="cx"> 
</span><del>-    bool isRenderingMask = object.view().frameView().paintBehavior() &amp; PaintBehaviorRenderingSVGMask;
-
-    // If we have no fill/stroke, return 0.
</del><ins>+    // If we have no fill/stroke, return nullptr.
</ins><span class="cx">     if (mode == ApplyToFillMode) {
</span><span class="cx">         // When rendering the mask for a RenderSVGResourceClipper, always use the initial fill paint server, and ignore stroke.
</span><span class="cx">         if (isRenderingMask) {
</span><span class="lines">@@ -69,16 +66,16 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (!svgStyle.hasFill())
</span><del>-            return 0;
</del><ins>+            return nullptr;
</ins><span class="cx">     } else {
</span><span class="cx">         if (!svgStyle.hasStroke() || isRenderingMask)
</span><del>-            return 0;
</del><ins>+            return nullptr;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     bool applyToFill = mode == ApplyToFillMode;
</span><span class="cx">     SVGPaint::SVGPaintType paintType = applyToFill ? svgStyle.fillPaintType() : svgStyle.strokePaintType();
</span><span class="cx">     if (paintType == SVGPaint::SVG_PAINTTYPE_NONE)
</span><del>-        return 0;
</del><ins>+        return nullptr;
</ins><span class="cx"> 
</span><span class="cx">     Color color;
</span><span class="cx">     switch (paintType) {
</span><span class="lines">@@ -93,7 +90,7 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (style-&gt;insideLink() == InsideVisitedLink) {
</del><ins>+    if (style.insideLink() == InsideVisitedLink) {
</ins><span class="cx">         // FIXME: This code doesn't support the uri component of the visited link paint, https://bugs.webkit.org/show_bug.cgi?id=70006
</span><span class="cx">         SVGPaint::SVGPaintType visitedPaintType = applyToFill ? svgStyle.visitedLinkFillPaintType() : svgStyle.visitedLinkStrokePaintType();
</span><span class="cx"> 
</span><span class="lines">@@ -108,18 +105,18 @@
</span><span class="cx">     // If the primary resource is just a color, return immediately.
</span><span class="cx">     RenderSVGResourceSolidColor* colorResource = RenderSVGResource::sharedSolidPaintingResource();
</span><span class="cx">     if (paintType &lt; SVGPaint::SVG_PAINTTYPE_URI_NONE) {
</span><del>-        if (!inheritColorFromParentStyleIfNeeded(object, applyToFill, color))
-            return 0;
</del><ins>+        if (!inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
+            return nullptr;
</ins><span class="cx"> 
</span><span class="cx">         colorResource-&gt;setColor(color);
</span><span class="cx">         return colorResource;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // If no resources are associated with the given renderer, return the color resource.
</span><del>-    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(&amp;object);
</del><ins>+    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(&amp;renderer);
</ins><span class="cx">     if (!resources) {
</span><del>-        if (paintType == SVGPaint::SVG_PAINTTYPE_URI_NONE || !inheritColorFromParentStyleIfNeeded(object, applyToFill, color))
-            return 0;
</del><ins>+        if (paintType == SVGPaint::SVG_PAINTTYPE_URI_NONE || !inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
+            return nullptr;
</ins><span class="cx"> 
</span><span class="cx">         colorResource-&gt;setColor(color);
</span><span class="cx">         return colorResource;
</span><span class="lines">@@ -128,8 +125,8 @@
</span><span class="cx">     // If the requested resource is not available, return the color resource.
</span><span class="cx">     RenderSVGResource* uriResource = mode == ApplyToFillMode ? resources-&gt;fill() : resources-&gt;stroke();
</span><span class="cx">     if (!uriResource) {
</span><del>-        if (!inheritColorFromParentStyleIfNeeded(object, applyToFill, color))
-            return 0;
</del><ins>+        if (!inheritColorFromParentStyleIfNeeded(renderer, applyToFill, color))
+            return nullptr;
</ins><span class="cx"> 
</span><span class="cx">         colorResource-&gt;setColor(color);
</span><span class="cx">         return colorResource;
</span><span class="lines">@@ -141,14 +138,14 @@
</span><span class="cx">     return uriResource;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderSVGResource* RenderSVGResource::fillPaintingResource(RenderElement&amp; object, const RenderStyle* style, Color&amp; fallbackColor)
</del><ins>+RenderSVGResource* RenderSVGResource::fillPaintingResource(RenderElement&amp; renderer, const RenderStyle&amp; style, Color&amp; fallbackColor)
</ins><span class="cx"> {
</span><del>-    return requestPaintingResource(ApplyToFillMode, object, style, fallbackColor);
</del><ins>+    return requestPaintingResource(ApplyToFillMode, renderer, style, fallbackColor);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-RenderSVGResource* RenderSVGResource::strokePaintingResource(RenderElement&amp; object, const RenderStyle* style, Color&amp; fallbackColor)
</del><ins>+RenderSVGResource* RenderSVGResource::strokePaintingResource(RenderElement&amp; renderer, const RenderStyle&amp; style, Color&amp; fallbackColor)
</ins><span class="cx"> {
</span><del>-    return requestPaintingResource(ApplyToStrokeMode, object, style, fallbackColor);
</del><ins>+    return requestPaintingResource(ApplyToStrokeMode, renderer, style, fallbackColor);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RenderSVGResourceSolidColor* RenderSVGResource::sharedSolidPaintingResource()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.h (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.h        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.h        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Helper utilities used in the render tree to access resources used for painting shapes/text (gradients &amp; patterns &amp; solid colors only)
</span><del>-    static RenderSVGResource* fillPaintingResource(RenderElement&amp;, const RenderStyle*, Color&amp; fallbackColor);
-    static RenderSVGResource* strokePaintingResource(RenderElement&amp;, const RenderStyle*, Color&amp; fallbackColor);
</del><ins>+    static RenderSVGResource* fillPaintingResource(RenderElement&amp;, const RenderStyle&amp;, Color&amp; fallbackColor);
+    static RenderSVGResource* strokePaintingResource(RenderElement&amp;, const RenderStyle&amp;, Color&amp; fallbackColor);
</ins><span class="cx">     static RenderSVGResourceSolidColor* sharedSolidPaintingResource();
</span><span class="cx"> 
</span><span class="cx">     static void markForLayoutAndParentResourceInvalidation(RenderObject*, bool needsLayout = true);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     Color fallbackColor;
</span><del>-    if (requiresFill &amp;&amp; !RenderSVGResource::fillPaintingResource(*this, &amp;style(), fallbackColor))
</del><ins>+    if (requiresFill &amp;&amp; !RenderSVGResource::fillPaintingResource(*this, style(), fallbackColor))
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     return shapeDependentFillContains(point, fillRule);
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     Color fallbackColor;
</span><del>-    if (requiresStroke &amp;&amp; !RenderSVGResource::strokePaintingResource(*this, &amp;style(), fallbackColor))
</del><ins>+    if (requiresStroke &amp;&amp; !RenderSVGResource::strokePaintingResource(*this, style(), fallbackColor))
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     return shapeDependentStrokeContains(point);
</span><span class="lines">@@ -231,31 +231,31 @@
</span><span class="cx">     return resources-&gt;markerStart() || resources-&gt;markerMid() || resources-&gt;markerEnd();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderSVGShape::fillShape(RenderStyle* style, GraphicsContext* context)
</del><ins>+void RenderSVGShape::fillShape(const RenderStyle&amp; style, GraphicsContext* context)
</ins><span class="cx"> {
</span><span class="cx">     Color fallbackColor;
</span><span class="cx">     if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(*this, style, fallbackColor)) {
</span><del>-        if (fillPaintingResource-&gt;applyResource(*this, *style, context, ApplyToFillMode))
</del><ins>+        if (fillPaintingResource-&gt;applyResource(*this, style, context, ApplyToFillMode))
</ins><span class="cx">             fillPaintingResource-&gt;postApplyResource(*this, context, ApplyToFillMode, 0, this);
</span><span class="cx">         else if (fallbackColor.isValid()) {
</span><span class="cx">             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
</span><span class="cx">             fallbackResource-&gt;setColor(fallbackColor);
</span><del>-            if (fallbackResource-&gt;applyResource(*this, *style, context, ApplyToFillMode))
</del><ins>+            if (fallbackResource-&gt;applyResource(*this, style, context, ApplyToFillMode))
</ins><span class="cx">                 fallbackResource-&gt;postApplyResource(*this, context, ApplyToFillMode, 0, this);
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderSVGShape::strokeShape(RenderStyle* style, GraphicsContext* context)
</del><ins>+void RenderSVGShape::strokeShape(const RenderStyle&amp; style, GraphicsContext* context)
</ins><span class="cx"> {
</span><span class="cx">     Color fallbackColor;
</span><span class="cx">     if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(*this, style, fallbackColor)) {
</span><del>-        if (strokePaintingResource-&gt;applyResource(*this, *style, context, ApplyToStrokeMode))
</del><ins>+        if (strokePaintingResource-&gt;applyResource(*this, style, context, ApplyToStrokeMode))
</ins><span class="cx">             strokePaintingResource-&gt;postApplyResource(*this, context, ApplyToStrokeMode, 0, this);
</span><span class="cx">         else if (fallbackColor.isValid()) {
</span><span class="cx">             RenderSVGResourceSolidColor* fallbackResource = RenderSVGResource::sharedSolidPaintingResource();
</span><span class="cx">             fallbackResource-&gt;setColor(fallbackColor);
</span><del>-            if (fallbackResource-&gt;applyResource(*this, *style, context, ApplyToStrokeMode))
</del><ins>+            if (fallbackResource-&gt;applyResource(*this, style, context, ApplyToStrokeMode))
</ins><span class="cx">                 fallbackResource-&gt;postApplyResource(*this, context, ApplyToStrokeMode, 0, this);
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="lines">@@ -263,11 +263,9 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderSVGShape::fillAndStrokeShape(GraphicsContext* context)
</span><span class="cx"> {
</span><del>-    RenderStyle&amp; style = this-&gt;style();
</del><ins>+    fillShape(style(), context);
</ins><span class="cx"> 
</span><del>-    fillShape(&amp;style, context);
-
-    if (!style.svgStyle().hasVisibleStroke())
</del><ins>+    if (!style().svgStyle().hasVisibleStroke())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     GraphicsContextStateSaver stateSaver(*context, false);
</span><span class="lines">@@ -278,7 +276,7 @@
</span><span class="cx">             return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    strokeShape(&amp;style, context);
</del><ins>+    strokeShape(style(), context);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderSVGShape::paint(PaintInfo&amp; paintInfo, const LayoutPoint&amp;)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGShapeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGShape.h (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGShape.h        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGShape.h        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx">     FloatRect markerRect(float strokeWidth) const;
</span><span class="cx">     void processMarkerPositions();
</span><span class="cx"> 
</span><del>-    void fillShape(RenderStyle*, GraphicsContext*);
-    void strokeShape(RenderStyle*, GraphicsContext*);
</del><ins>+    void fillShape(const RenderStyle&amp;, GraphicsContext*);
+    void strokeShape(const RenderStyle&amp;, GraphicsContext*);
</ins><span class="cx">     void fillAndStrokeShape(GraphicsContext*);
</span><span class="cx">     void drawMarkers(PaintInfo&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -331,9 +331,9 @@
</span><span class="cx"> 
</span><span class="cx">     Color fallbackColor;
</span><span class="cx">     if (m_paintingResourceMode &amp; ApplyToFillMode)
</span><del>-        m_paintingResource = RenderSVGResource::fillPaintingResource(renderer, style, fallbackColor);
</del><ins>+        m_paintingResource = RenderSVGResource::fillPaintingResource(renderer, *style, fallbackColor);
</ins><span class="cx">     else if (m_paintingResourceMode &amp; ApplyToStrokeMode)
</span><del>-        m_paintingResource = RenderSVGResource::strokePaintingResource(renderer, style, fallbackColor);
</del><ins>+        m_paintingResource = RenderSVGResource::strokePaintingResource(renderer, *style, fallbackColor);
</ins><span class="cx">     else {
</span><span class="cx">         // We're either called for stroking or filling.
</span><span class="cx">         ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (158902 => 158903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp        2013-11-08 05:21:32 UTC (rev 158902)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp        2013-11-08 05:24:20 UTC (rev 158903)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx">         const RenderSVGShape&amp; shape = static_cast&lt;const RenderSVGShape&amp;&gt;(object);
</span><span class="cx"> 
</span><span class="cx">         Color fallbackColor;
</span><del>-        if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(const_cast&lt;RenderSVGShape&amp;&gt;(shape), &amp;shape.style(), fallbackColor)) {
</del><ins>+        if (RenderSVGResource* strokePaintingResource = RenderSVGResource::strokePaintingResource(const_cast&lt;RenderSVGShape&amp;&gt;(shape), shape.style(), fallbackColor)) {
</ins><span class="cx">             TextStreamSeparator s(&quot; &quot;);
</span><span class="cx">             ts &lt;&lt; &quot; [stroke={&quot; &lt;&lt; s;
</span><span class="cx">             writeSVGPaintingResource(ts, strokePaintingResource);
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">             ts &lt;&lt; &quot;}]&quot;;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(const_cast&lt;RenderSVGShape&amp;&gt;(shape), &amp;shape.style(), fallbackColor)) {
</del><ins>+        if (RenderSVGResource* fillPaintingResource = RenderSVGResource::fillPaintingResource(const_cast&lt;RenderSVGShape&amp;&gt;(shape), shape.style(), fallbackColor)) {
</ins><span class="cx">             TextStreamSeparator s(&quot; &quot;);
</span><span class="cx">             ts &lt;&lt; &quot; [fill={&quot; &lt;&lt; s;
</span><span class="cx">             writeSVGPaintingResource(ts, fillPaintingResource);
</span></span></pre>
</div>
</div>

</body>
</html>