<!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>[175117] 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/175117">175117</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-10-23 05:20:44 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Const-ify static s_resourceType members in RenderSVGResource* classes
https://bugs.webkit.org/show_bug.cgi?id=137911
Reviewed by Andreas Kling.
Make s_resourceType static members in RenderSVGResource* classes const.
Also update the resourceType() methods, where necessary, so that they
return the s_resourceType constant.
* rendering/svg/RenderSVGResourceClipper.cpp:
* rendering/svg/RenderSVGResourceClipper.h:
* rendering/svg/RenderSVGResourceFilter.cpp:
* rendering/svg/RenderSVGResourceFilter.h:
* rendering/svg/RenderSVGResourceLinearGradient.cpp:
* rendering/svg/RenderSVGResourceLinearGradient.h:
* rendering/svg/RenderSVGResourceMarker.cpp:
* rendering/svg/RenderSVGResourceMarker.h:
* rendering/svg/RenderSVGResourceMasker.cpp:
* rendering/svg/RenderSVGResourceMasker.h:
* rendering/svg/RenderSVGResourcePattern.cpp:
* rendering/svg/RenderSVGResourcePattern.h:
* rendering/svg/RenderSVGResourceRadialGradient.cpp:
* rendering/svg/RenderSVGResourceRadialGradient.h:
* rendering/svg/RenderSVGResourceSolidColor.cpp:
* rendering/svg/RenderSVGResourceSolidColor.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceLinearGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceLinearGradienth">trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMarkercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMarkerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceRadialGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceRadialGradienth">trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/ChangeLog 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-10-23 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Const-ify static s_resourceType members in RenderSVGResource* classes
+ https://bugs.webkit.org/show_bug.cgi?id=137911
+
+ Reviewed by Andreas Kling.
+
+ Make s_resourceType static members in RenderSVGResource* classes const.
+ Also update the resourceType() methods, where necessary, so that they
+ return the s_resourceType constant.
+
+ * rendering/svg/RenderSVGResourceClipper.cpp:
+ * rendering/svg/RenderSVGResourceClipper.h:
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ * rendering/svg/RenderSVGResourceFilter.h:
+ * rendering/svg/RenderSVGResourceLinearGradient.cpp:
+ * rendering/svg/RenderSVGResourceLinearGradient.h:
+ * rendering/svg/RenderSVGResourceMarker.cpp:
+ * rendering/svg/RenderSVGResourceMarker.h:
+ * rendering/svg/RenderSVGResourceMasker.cpp:
+ * rendering/svg/RenderSVGResourceMasker.h:
+ * rendering/svg/RenderSVGResourcePattern.cpp:
+ * rendering/svg/RenderSVGResourcePattern.h:
+ * rendering/svg/RenderSVGResourceRadialGradient.cpp:
+ * rendering/svg/RenderSVGResourceRadialGradient.h:
+ * rendering/svg/RenderSVGResourceSolidColor.cpp:
+ * rendering/svg/RenderSVGResourceSolidColor.h:
+
+2014-10-23 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [TexMap] Clean up virtual method declarations in GraphicsLayerTextureMapper
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137957
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -40,8 +40,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceClipper::s_resourceType = ClipperResourceType;
-
</del><span class="cx"> RenderSVGResourceClipper::RenderSVGResourceClipper(SVGClipPathElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceContainer(element, WTF::move(style))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx"> bool applyClippingToContext(RenderElement&, const FloatRect&, const FloatRect&, GraphicsContext*);
</span><span class="cx"> virtual FloatRect resourceBoundingBox(const RenderObject&) override;
</span><span class="cx">
</span><del>- virtual RenderSVGResourceType resourceType() const override { return ClipperResourceType; }
</del><ins>+ static const RenderSVGResourceType s_resourceType = ClipperResourceType;
+ virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</ins><span class="cx">
</span><span class="cx"> bool hitTestClipContent(const FloatRect&, const FloatPoint&);
</span><span class="cx">
</span><span class="cx"> SVGUnitTypes::SVGUnitType clipPathUnits() const { return clipPathElement().clipPathUnits(); }
</span><span class="cx">
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx"> private:
</span><span class="cx"> void element() const = delete;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -44,8 +44,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceFilter::s_resourceType = FilterResourceType;
-
</del><span class="cx"> RenderSVGResourceFilter::RenderSVGResourceFilter(SVGFilterElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceContainer(element, WTF::move(style))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx">
</span><span class="cx"> void primitiveAttributeChanged(RenderObject*, const QualifiedName&);
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = FilterResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> FloatRect drawingRegion(RenderObject*) const;
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceLinearGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceLinearGradient::s_resourceType = LinearGradientResourceType;
-
</del><span class="cx"> RenderSVGResourceLinearGradient::RenderSVGResourceLinearGradient(SVGLinearGradientElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceGradient(element, WTF::move(style))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceLinearGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> SVGLinearGradientElement& linearGradientElement() const { return downcast<SVGLinearGradientElement>(RenderSVGResourceGradient::gradientElement()); }
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = LinearGradientResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> virtual SVGUnitTypes::SVGUnitType gradientUnits() const override { return m_attributes.gradientUnits(); }
</span><span class="cx"> virtual void calculateGradientTransform(AffineTransform& transform) override { transform = m_attributes.gradientTransform(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceMarker::s_resourceType = MarkerResourceType;
-
</del><span class="cx"> RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceContainer(element, WTF::move(style))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> float angle() const;
</span><span class="cx"> SVGMarkerUnitsType markerUnits() const { return markerElement().markerUnits(); }
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = MarkerResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void element() const = delete;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceMasker::s_resourceType = MaskerResourceType;
-
</del><span class="cx"> RenderSVGResourceMasker::RenderSVGResourceMasker(SVGMaskElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceContainer(element, WTF::move(style))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> SVGUnitTypes::SVGUnitType maskUnits() const { return maskElement().maskUnits(); }
</span><span class="cx"> SVGUnitTypes::SVGUnitType maskContentUnits() const { return maskElement().maskContentUnits(); }
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = MaskerResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void element() const = delete;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourcePattern::s_resourceType = PatternResourceType;
-
</del><span class="cx"> RenderSVGResourcePattern::RenderSVGResourcePattern(SVGPatternElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceContainer(element, WTF::move(style))
</span><span class="cx"> , m_shouldCollectPatternAttributes(true)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
</span><span class="cx"> virtual FloatRect resourceBoundingBox(const RenderObject&) override { return FloatRect(); }
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = PatternResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void element() const = delete;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceRadialGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceRadialGradient::s_resourceType = RadialGradientResourceType;
-
</del><span class="cx"> RenderSVGResourceRadialGradient::RenderSVGResourceRadialGradient(SVGRadialGradientElement& element, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderSVGResourceGradient(element, WTF::move(style))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceRadialGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx">
</span><span class="cx"> SVGRadialGradientElement& radialGradientElement() const { return downcast<SVGRadialGradientElement>(RenderSVGResourceGradient::gradientElement()); }
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = RadialGradientResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> virtual SVGUnitTypes::SVGUnitType gradientUnits() const override { return m_attributes.gradientUnits(); }
</span><span class="cx"> virtual void calculateGradientTransform(AffineTransform& transform) override { transform = m_attributes.gradientTransform(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderSVGResourceType RenderSVGResourceSolidColor::s_resourceType = SolidColorResourceType;
-
</del><span class="cx"> RenderSVGResourceSolidColor::RenderSVGResourceSolidColor()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h (175116 => 175117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h 2014-10-23 11:17:38 UTC (rev 175116)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h 2014-10-23 12:20:44 UTC (rev 175117)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
</span><span class="cx"> virtual FloatRect resourceBoundingBox(const RenderObject&) override { return FloatRect(); }
</span><span class="cx">
</span><ins>+ static const RenderSVGResourceType s_resourceType = SolidColorResourceType;
</ins><span class="cx"> virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</span><del>- static RenderSVGResourceType s_resourceType;
</del><span class="cx">
</span><span class="cx"> const Color& color() const { return m_color; }
</span><span class="cx"> void setColor(const Color& color) { m_color = color; }
</span></span></pre>
</div>
</div>
</body>
</html>