<!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>[174410] trunk/Source</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/174410">174410</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-10-07 15:26:25 -0700 (Tue, 07 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use more Ref and PassRef for Gradient.
&lt;https://webkit.org/b/137490&gt;

Codify the fact that CanvasGradient always has an internal WebCore::Gradient
and make GraphicsContext gradient setters take PassRef, exposing some
unnecessary null checks.

Reviewed by Christophe Dumez.

* WebCore.exp.in:
* html/canvas/CanvasGradient.h:
(WebCore::CanvasGradient::gradient):
* platform/graphics/Gradient.h:
(WebCore::Gradient::create):
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::setStrokeGradient):
(WebCore::GraphicsContext::setFillGradient):
* platform/graphics/GraphicsContext.h:
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::paintProgressBar):
* rendering/svg/RenderSVGPath.cpp:
(WebCore::useStrokeStyleToFill):
* rendering/svg/RenderSVGResourceGradient.cpp:
(WebCore::RenderSVGResourceGradient::applyResource):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasGradienth">trunk/Source/WebCore/html/canvas/CanvasGradient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGradienth">trunk/Source/WebCore/platform/graphics/Gradient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGPathcpp">trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessFindIndicatorcpp">trunk/Source/WebKit2/UIProcess/FindIndicator.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/ChangeLog        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-10-07  Andreas Kling  &lt;akling@apple.com&gt;
+
+        Use more Ref and PassRef for Gradient.
+        &lt;https://webkit.org/b/137490&gt;
+
+        Codify the fact that CanvasGradient always has an internal WebCore::Gradient
+        and make GraphicsContext gradient setters take PassRef, exposing some
+        unnecessary null checks.
+
+        Reviewed by Christophe Dumez.
+
+        * WebCore.exp.in:
+        * html/canvas/CanvasGradient.h:
+        (WebCore::CanvasGradient::gradient):
+        * platform/graphics/Gradient.h:
+        (WebCore::Gradient::create):
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::setStrokeGradient):
+        (WebCore::GraphicsContext::setFillGradient):
+        * platform/graphics/GraphicsContext.h:
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::paintProgressBar):
+        * rendering/svg/RenderSVGPath.cpp:
+        (WebCore::useStrokeStyleToFill):
+        * rendering/svg/RenderSVGResourceGradient.cpp:
+        (WebCore::RenderSVGResourceGradient::applyResource):
+
</ins><span class="cx"> 2014-10-07  Martin Hock  &lt;mhock@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Defer resolution of viewport size.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/WebCore.exp.in        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> __ZN7WebCore15GraphicsContext12setFillColorERKNS_5ColorENS_10ColorSpaceE
</span><span class="cx"> __ZN7WebCore15GraphicsContext14setStrokeColorERKNS_5ColorENS_10ColorSpaceE
</span><span class="cx"> __ZN7WebCore15GraphicsContext15drawNativeImageEP7CGImageRKNS_9FloatSizeENS_10ColorSpaceERKNS_9FloatRectES9_NS_17CompositeOperatorENS_9BlendModeENS_16ImageOrientationE
</span><del>-__ZN7WebCore15GraphicsContext15setFillGradientEN3WTF10PassRefPtrINS_8GradientEEE
</del><ins>+__ZN7WebCore15GraphicsContext15setFillGradientEN3WTF7PassRefINS_8GradientEEE
</ins><span class="cx"> __ZN7WebCore15GraphicsContext18setShouldAntialiasEb
</span><span class="cx"> __ZN7WebCore15GraphicsContext19setIsCALayerContextEb
</span><span class="cx"> __ZN7WebCore15GraphicsContext20endTransparencyLayerEv
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasGradient.h (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasGradient.h        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/html/canvas/CanvasGradient.h        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx">             return adoptRef(new CanvasGradient(p0, r0, p1, r1));
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        Gradient* gradient() const { return m_gradient.get(); }
</del><ins>+        Gradient&amp; gradient() { return m_gradient.get(); }
+        const Gradient&amp; gradient() const { return m_gradient.get(); }
</ins><span class="cx"> 
</span><span class="cx">         void addColorStop(float value, const String&amp; color, ExceptionCode&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx">         CanvasGradient(const FloatPoint&amp; p0, const FloatPoint&amp; p1);
</span><span class="cx">         CanvasGradient(const FloatPoint&amp; p0, float r0, const FloatPoint&amp; p1, float r1);
</span><span class="cx">         
</span><del>-        RefPtr&lt;Gradient&gt; m_gradient;
</del><ins>+        Ref&lt;Gradient&gt; m_gradient;
</ins><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx">         bool m_dashbardCompatibilityMode;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Gradient.h (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Gradient.h        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/platform/graphics/Gradient.h        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -57,13 +57,13 @@
</span><span class="cx"> 
</span><span class="cx">     class Gradient : public RefCounted&lt;Gradient&gt; {
</span><span class="cx">     public:
</span><del>-        static PassRefPtr&lt;Gradient&gt; create(const FloatPoint&amp; p0, const FloatPoint&amp; p1)
</del><ins>+        static PassRef&lt;Gradient&gt; create(const FloatPoint&amp; p0, const FloatPoint&amp; p1)
</ins><span class="cx">         {
</span><del>-            return adoptRef(new Gradient(p0, p1));
</del><ins>+            return adoptRef(*new Gradient(p0, p1));
</ins><span class="cx">         }
</span><del>-        static PassRefPtr&lt;Gradient&gt; create(const FloatPoint&amp; p0, float r0, const FloatPoint&amp; p1, float r1, float aspectRatio = 1)
</del><ins>+        static PassRef&lt;Gradient&gt; create(const FloatPoint&amp; p0, float r0, const FloatPoint&amp; p1, float r1, float aspectRatio = 1)
</ins><span class="cx">         {
</span><del>-            return adoptRef(new Gradient(p0, r0, p1, r1, aspectRatio));
</del><ins>+            return adoptRef(*new Gradient(p0, r0, p1, r1, aspectRatio));
</ins><span class="cx">         }
</span><span class="cx">         WEBCORE_EXPORT ~Gradient();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -347,25 +347,15 @@
</span><span class="cx">     m_state.fillPattern = WTF::move(pattern);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GraphicsContext::setStrokeGradient(PassRefPtr&lt;Gradient&gt; gradient)
</del><ins>+void GraphicsContext::setStrokeGradient(PassRef&lt;Gradient&gt; gradient)
</ins><span class="cx"> {
</span><del>-    ASSERT(gradient);
-    if (!gradient) {
-        setStrokeColor(Color::black, ColorSpaceDeviceRGB);
-        return;
-    }
-    m_state.strokeGradient = gradient;
</del><ins>+    m_state.strokeGradient = WTF::move(gradient);
</ins><span class="cx">     m_state.strokePattern.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GraphicsContext::setFillGradient(PassRefPtr&lt;Gradient&gt; gradient)
</del><ins>+void GraphicsContext::setFillGradient(PassRef&lt;Gradient&gt; gradient)
</ins><span class="cx"> {
</span><del>-    ASSERT(gradient);
-    if (!gradient) {
-        setFillColor(Color::black, ColorSpaceDeviceRGB);
-        return;
-    }
-    m_state.fillGradient = gradient;
</del><ins>+    m_state.fillGradient = WTF::move(gradient);
</ins><span class="cx">     m_state.fillPattern.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">         void setStrokePattern(PassRef&lt;Pattern&gt;);
</span><span class="cx">         Pattern* strokePattern() const;
</span><span class="cx"> 
</span><del>-        void setStrokeGradient(PassRefPtr&lt;Gradient&gt;);
</del><ins>+        void setStrokeGradient(PassRef&lt;Gradient&gt;);
</ins><span class="cx">         Gradient* strokeGradient() const;
</span><span class="cx"> 
</span><span class="cx">         WindRule fillRule() const;
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         void setFillPattern(PassRef&lt;Pattern&gt;);
</span><span class="cx">         Pattern* fillPattern() const;
</span><span class="cx"> 
</span><del>-        WEBCORE_EXPORT void setFillGradient(PassRefPtr&lt;Gradient&gt;);
</del><ins>+        WEBCORE_EXPORT void setFillGradient(PassRef&lt;Gradient&gt;);
</ins><span class="cx">         Gradient* fillGradient() const;
</span><span class="cx"> 
</span><span class="cx">         void setShadowsIgnoreTransforms(bool);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -874,7 +874,7 @@
</span><span class="cx">     strokeGradient-&gt;addColorStop(0.45, Color(0xee, 0xee, 0xee));
</span><span class="cx">     strokeGradient-&gt;addColorStop(0.55, Color(0xee, 0xee, 0xee));
</span><span class="cx">     strokeGradient-&gt;addColorStop(1.0, Color(0x8d, 0x8d, 0x8d));
</span><del>-    context-&gt;setStrokeGradient(strokeGradient.release());
</del><ins>+    context-&gt;setStrokeGradient(strokeGradient.releaseNonNull());
</ins><span class="cx"> 
</span><span class="cx">     ColorSpace colorSpace = renderer.style().colorSpace();
</span><span class="cx">     context-&gt;setFillColor(Color(255, 255, 255), colorSpace);
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx">     RefPtr&lt;Gradient&gt; upperGradient = Gradient::create(FloatPoint(rect.x(), verticalRenderingPosition + 0.5), FloatPoint(rect.x(), verticalRenderingPosition + upperGradientHeight - 1.5));
</span><span class="cx">     upperGradient-&gt;addColorStop(0.0, Color(133, 133, 133, 188));
</span><span class="cx">     upperGradient-&gt;addColorStop(1.0, Color(18, 18, 18, 51));
</span><del>-    context-&gt;setFillGradient(upperGradient.release());
</del><ins>+    context-&gt;setFillGradient(upperGradient.releaseNonNull());
</ins><span class="cx"> 
</span><span class="cx">     context-&gt;fillRect(FloatRect(rect.x(), verticalRenderingPosition, rect.width(), upperGradientHeight));
</span><span class="cx"> 
</span><span class="lines">@@ -909,13 +909,13 @@
</span><span class="cx">         barGradient-&gt;addColorStop(0.51, Color(36, 114, 210));
</span><span class="cx">         barGradient-&gt;addColorStop(0.55, Color(36, 114, 210));
</span><span class="cx">         barGradient-&gt;addColorStop(1.0, Color(57, 142, 244));
</span><del>-        context-&gt;setFillGradient(barGradient.release());
</del><ins>+        context-&gt;setFillGradient(barGradient.releaseNonNull());
</ins><span class="cx"> 
</span><span class="cx">         RefPtr&lt;Gradient&gt; barStrokeGradient = Gradient::create(FloatPoint(rect.x(), verticalRenderingPosition), FloatPoint(rect.x(), verticalRenderingPosition + progressBarHeight - 1));
</span><span class="cx">         barStrokeGradient-&gt;addColorStop(0.0, Color(95, 107, 183));
</span><span class="cx">         barStrokeGradient-&gt;addColorStop(0.5, Color(66, 106, 174, 240));
</span><span class="cx">         barStrokeGradient-&gt;addColorStop(1.0, Color(38, 104, 166));
</span><del>-        context-&gt;setStrokeGradient(barStrokeGradient.release());
</del><ins>+        context-&gt;setStrokeGradient(barStrokeGradient.releaseNonNull());
</ins><span class="cx"> 
</span><span class="cx">         Path barPath;
</span><span class="cx">         int left = rect.x();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGPath.cpp        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> static void useStrokeStyleToFill(GraphicsContext* context)
</span><span class="cx"> {
</span><span class="cx">     if (Gradient* gradient = context-&gt;strokeGradient())
</span><del>-        context-&gt;setFillGradient(gradient);
</del><ins>+        context-&gt;setFillGradient(*gradient);
</ins><span class="cx">     else if (Pattern* pattern = context-&gt;strokePattern())
</span><span class="cx">         context-&gt;setFillPattern(*pattern);
</span><span class="cx">     else
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -177,13 +177,13 @@
</span><span class="cx"> 
</span><span class="cx">     if (resourceMode &amp; ApplyToFillMode) {
</span><span class="cx">         context-&gt;setAlpha(svgStyle.fillOpacity());
</span><del>-        context-&gt;setFillGradient(gradientData-&gt;gradient);
</del><ins>+        context-&gt;setFillGradient(*gradientData-&gt;gradient);
</ins><span class="cx">         context-&gt;setFillRule(svgStyle.fillRule());
</span><span class="cx">     } else if (resourceMode &amp; ApplyToStrokeMode) {
</span><span class="cx">         if (svgStyle.vectorEffect() == VE_NON_SCALING_STROKE)
</span><span class="cx">             gradientData-&gt;gradient-&gt;setGradientSpaceTransform(transformOnNonScalingStroke(&amp;renderer, gradientData-&gt;userspaceTransform));
</span><span class="cx">         context-&gt;setAlpha(svgStyle.strokeOpacity());
</span><del>-        context-&gt;setStrokeGradient(gradientData-&gt;gradient);
</del><ins>+        context-&gt;setStrokeGradient(*gradientData-&gt;gradient);
</ins><span class="cx">         SVGRenderSupport::applyStrokeStyleToContext(context, style, renderer);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> 
</span><span class="cx">             FloatRect targetRect;
</span><span class="cx">             gradientData-&gt;gradient-&gt;setGradientSpaceTransform(clipToTextMask(context, m_imageBuffer, targetRect, &amp;renderer, gradientUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX, gradientTransform));
</span><del>-            context-&gt;setFillGradient(gradientData-&gt;gradient);
</del><ins>+            context-&gt;setFillGradient(*gradientData-&gt;gradient);
</ins><span class="cx"> 
</span><span class="cx">             context-&gt;fillRect(targetRect);
</span><span class="cx">             m_imageBuffer.reset();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessFindIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/FindIndicator.cpp (174409 => 174410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/FindIndicator.cpp        2014-10-07 22:17:09 UTC (rev 174409)
+++ trunk/Source/WebKit2/UIProcess/FindIndicator.cpp        2014-10-07 22:26:25 UTC (rev 174410)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">             RefPtr&lt;Gradient&gt; gradient = Gradient::create(FloatPoint(innerPathRect.x(), innerPathRect.y()), FloatPoint(innerPathRect.x(), innerPathRect.maxY()));
</span><span class="cx">             gradient-&gt;addColorStop(0, gradientLightColor());
</span><span class="cx">             gradient-&gt;addColorStop(1, gradientDarkColor());
</span><del>-            graphicsContext.setFillGradient(gradient);
</del><ins>+            graphicsContext.setFillGradient(gradient.releaseNonNull());
</ins><span class="cx">             graphicsContext.fillRect(outerPathRect);
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>