Const-ify static s_resourceType members in RenderSVGResouce* classes

This is a merge of http://trac.webkit.org/changeset/175117 by zandobersek@gmail.com

BUG=425730

Review URL: https://codereview.chromium.org/694283002

git-svn-id: svn://svn.chromium.org/blink/trunk@184819 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.cpp

@@ -41,8 +41,6 @@
 
 namespace blink {
 
-const RenderSVGResourceType RenderSVGResourceClipper::s_resourceType = ClipperResourceType;
-
 RenderSVGResourceClipper::RenderSVGResourceClipper(SVGClipPathElement* node)
     : RenderSVGResourceContainer(node)
     , m_inClipExpansion(false)

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.h

@@ -56,13 +56,13 @@ public:
 
     FloatRect resourceBoundingBox(const RenderObject*);
 
+    static const RenderSVGResourceType s_resourceType = ClipperResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
 
     bool hitTestClipContent(const FloatRect&, const FloatPoint&);
 
     SVGUnitTypes::SVGUnitType clipPathUnits() const { return toSVGClipPathElement(element())->clipPathUnits()->currentValue()->enumValue(); }
 
-    static const RenderSVGResourceType s_resourceType;
 private:
     bool tryPathOnlyClipping(GraphicsContext*, const AffineTransform&, const FloatRect&);
     void drawClipMaskContent(GraphicsContext*, const FloatRect& targetBoundingBox);

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceFilter.cpp

@@ -33,8 +33,6 @@
 
 namespace blink {
 
-const RenderSVGResourceType RenderSVGResourceFilter::s_resourceType = FilterResourceType;
-
 RenderSVGResourceFilter::RenderSVGResourceFilter(SVGFilterElement* node)
     : RenderSVGResourceContainer(node)
 {

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceFilter.h

@@ -76,8 +76,8 @@ public:
 
     void primitiveAttributeChanged(RenderObject*, const QualifiedName&);
 
+    static const RenderSVGResourceType s_resourceType = FilterResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
-    static const RenderSVGResourceType s_resourceType;
 
     FloatRect drawingRegion(RenderObject*) const;
 private:

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceLinearGradient.cpp

@@ -26,8 +26,6 @@
 
 namespace blink {
 
-const RenderSVGResourceType RenderSVGResourceLinearGradient::s_resourceType = LinearGradientResourceType;
-
 RenderSVGResourceLinearGradient::RenderSVGResourceLinearGradient(SVGLinearGradientElement* node)
     : RenderSVGResourceGradient(node)
 {

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceLinearGradient.h

@@ -35,8 +35,8 @@ public:
 
     virtual const char* renderName() const override { return "RenderSVGResourceLinearGradient"; }
 
+    static const RenderSVGResourceType s_resourceType = LinearGradientResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
-    static const RenderSVGResourceType s_resourceType;
 
     virtual SVGUnitTypes::SVGUnitType gradientUnits() const override { return m_attributes.gradientUnits(); }
     virtual void calculateGradientTransform(AffineTransform& transform) override { transform = m_attributes.gradientTransform(); }

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMarker.cpp

@@ -28,8 +28,6 @@
 
 namespace blink {
 
-const RenderSVGResourceType RenderSVGResourceMarker::s_resourceType = MarkerResourceType;
-
 RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement* node)
     : RenderSVGResourceContainer(node)
 {

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMarker.h

@@ -56,8 +56,8 @@ public:
 
     const FloatRect& viewport() const { return m_viewport; }
 
+    static const RenderSVGResourceType s_resourceType = MarkerResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
-    static const RenderSVGResourceType s_resourceType;
 
 private:
     // Generates a transformation matrix usable to render marker content. Handles scaling the marker content

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.cpp

@@ -29,8 +29,6 @@
 
 namespace blink {
 
-const RenderSVGResourceType RenderSVGResourceMasker::s_resourceType = MaskerResourceType;
-
 RenderSVGResourceMasker::RenderSVGResourceMasker(SVGMaskElement* node)
     : RenderSVGResourceContainer(node)
 {

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceMasker.h

@@ -53,8 +53,8 @@ public:
     SVGUnitTypes::SVGUnitType maskUnits() const { return toSVGMaskElement(element())->maskUnits()->currentValue()->enumValue(); }
     SVGUnitTypes::SVGUnitType maskContentUnits() const { return toSVGMaskElement(element())->maskContentUnits()->currentValue()->enumValue(); }
 
+    static const RenderSVGResourceType s_resourceType = MaskerResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
-    static const RenderSVGResourceType s_resourceType;
 
 private:
     void calculateMaskContentPaintInvalidationRect();

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourcePattern.cpp

@@ -38,8 +38,6 @@ public:
     AffineTransform transform;
 };
 
-const RenderSVGResourceType RenderSVGResourcePattern::s_resourceType = PatternResourceType;
-
 RenderSVGResourcePattern::RenderSVGResourcePattern(SVGPatternElement* node)
     : RenderSVGResourcePaintServer(node)
     , m_shouldCollectPatternAttributes(true)

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourcePattern.h

@@ -48,8 +48,8 @@ public:
 
     virtual SVGPaintServer preparePaintServer(const RenderObject&) override;
 
+    static const RenderSVGResourceType s_resourceType = PatternResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
-    static const RenderSVGResourceType s_resourceType;
 
 private:
     PassOwnPtr<PatternData> buildPatternData(const RenderObject&);

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceRadialGradient.cpp

@@ -27,8 +27,6 @@
 
 namespace blink {
 
-const RenderSVGResourceType RenderSVGResourceRadialGradient::s_resourceType = RadialGradientResourceType;
-
 RenderSVGResourceRadialGradient::RenderSVGResourceRadialGradient(SVGRadialGradientElement* node)
     : RenderSVGResourceGradient(node)
 {

third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceRadialGradient.h

@@ -35,8 +35,8 @@ public:
 
     virtual const char* renderName() const override { return "RenderSVGResourceRadialGradient"; }
 
+    static const RenderSVGResourceType s_resourceType = RadialGradientResourceType;
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
-    static const RenderSVGResourceType s_resourceType;
 
     virtual SVGUnitTypes::SVGUnitType gradientUnits() const override { return m_attributes.gradientUnits(); }
     virtual void calculateGradientTransform(AffineTransform& transform) override { transform = m_attributes.gradientTransform(); }