Diff
Modified: trunk/Source/WebCore/ChangeLog (175116 => 175117)
--- 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)
@@ -1,5 +1,33 @@
2014-10-23 Zan Dobersek <[email protected]>
+ 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 <[email protected]>
+
[TexMap] Clean up virtual method declarations in GraphicsLayerTextureMapper
https://bugs.webkit.org/show_bug.cgi?id=137957
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (175116 => 175117)
--- 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)
@@ -40,8 +40,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceClipper::s_resourceType = ClipperResourceType;
-
RenderSVGResourceClipper::RenderSVGResourceClipper(SVGClipPathElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceContainer(element, WTF::move(style))
{
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h (175116 => 175117)
--- 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)
@@ -54,13 +54,13 @@
bool applyClippingToContext(RenderElement&, const FloatRect&, const FloatRect&, GraphicsContext*);
virtual FloatRect resourceBoundingBox(const RenderObject&) override;
- virtual RenderSVGResourceType resourceType() const override { return ClipperResourceType; }
+ 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 clipPathElement().clipPathUnits(); }
- static RenderSVGResourceType s_resourceType;
private:
void element() const = delete;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (175116 => 175117)
--- 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)
@@ -44,8 +44,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceFilter::s_resourceType = FilterResourceType;
-
RenderSVGResourceFilter::RenderSVGResourceFilter(SVGFilterElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceContainer(element, WTF::move(style))
{
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h (175116 => 175117)
--- 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)
@@ -82,8 +82,8 @@
void primitiveAttributeChanged(RenderObject*, const QualifiedName&);
+ static const RenderSVGResourceType s_resourceType = FilterResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
FloatRect drawingRegion(RenderObject*) const;
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.cpp (175116 => 175117)
--- 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)
@@ -24,8 +24,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceLinearGradient::s_resourceType = LinearGradientResourceType;
-
RenderSVGResourceLinearGradient::RenderSVGResourceLinearGradient(SVGLinearGradientElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceGradient(element, WTF::move(style))
{
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceLinearGradient.h (175116 => 175117)
--- 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)
@@ -34,8 +34,8 @@
SVGLinearGradientElement& linearGradientElement() const { return downcast<SVGLinearGradientElement>(RenderSVGResourceGradient::gradientElement()); }
+ static const RenderSVGResourceType s_resourceType = LinearGradientResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
virtual SVGUnitTypes::SVGUnitType gradientUnits() const override { return m_attributes.gradientUnits(); }
virtual void calculateGradientTransform(AffineTransform& transform) override { transform = m_attributes.gradientTransform(); }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp (175116 => 175117)
--- 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)
@@ -28,8 +28,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceMarker::s_resourceType = MarkerResourceType;
-
RenderSVGResourceMarker::RenderSVGResourceMarker(SVGMarkerElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceContainer(element, WTF::move(style))
{
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h (175116 => 175117)
--- 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)
@@ -59,8 +59,8 @@
float angle() const;
SVGMarkerUnitsType markerUnits() const { return markerElement().markerUnits(); }
+ static const RenderSVGResourceType s_resourceType = MarkerResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
private:
void element() const = delete;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (175116 => 175117)
--- 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)
@@ -29,8 +29,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceMasker::s_resourceType = MaskerResourceType;
-
RenderSVGResourceMasker::RenderSVGResourceMasker(SVGMaskElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceContainer(element, WTF::move(style))
{
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h (175116 => 175117)
--- 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)
@@ -50,8 +50,8 @@
SVGUnitTypes::SVGUnitType maskUnits() const { return maskElement().maskUnits(); }
SVGUnitTypes::SVGUnitType maskContentUnits() const { return maskElement().maskContentUnits(); }
+ static const RenderSVGResourceType s_resourceType = MaskerResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
private:
void element() const = delete;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (175116 => 175117)
--- 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)
@@ -30,8 +30,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourcePattern::s_resourceType = PatternResourceType;
-
RenderSVGResourcePattern::RenderSVGResourcePattern(SVGPatternElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceContainer(element, WTF::move(style))
, m_shouldCollectPatternAttributes(true)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (175116 => 175117)
--- 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)
@@ -51,8 +51,8 @@
virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
virtual FloatRect resourceBoundingBox(const RenderObject&) override { return FloatRect(); }
+ static const RenderSVGResourceType s_resourceType = PatternResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
private:
void element() const = delete;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.cpp (175116 => 175117)
--- 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)
@@ -24,8 +24,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceRadialGradient::s_resourceType = RadialGradientResourceType;
-
RenderSVGResourceRadialGradient::RenderSVGResourceRadialGradient(SVGRadialGradientElement& element, PassRef<RenderStyle> style)
: RenderSVGResourceGradient(element, WTF::move(style))
{
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceRadialGradient.h (175116 => 175117)
--- 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)
@@ -36,8 +36,8 @@
SVGRadialGradientElement& radialGradientElement() const { return downcast<SVGRadialGradientElement>(RenderSVGResourceGradient::gradientElement()); }
+ static const RenderSVGResourceType s_resourceType = RadialGradientResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
virtual SVGUnitTypes::SVGUnitType gradientUnits() const override { return m_attributes.gradientUnits(); }
virtual void calculateGradientTransform(AffineTransform& transform) override { transform = m_attributes.gradientTransform(); }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.cpp (175116 => 175117)
--- 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)
@@ -28,8 +28,6 @@
namespace WebCore {
-RenderSVGResourceType RenderSVGResourceSolidColor::s_resourceType = SolidColorResourceType;
-
RenderSVGResourceSolidColor::RenderSVGResourceSolidColor()
{
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h (175116 => 175117)
--- 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)
@@ -37,8 +37,8 @@
virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
virtual FloatRect resourceBoundingBox(const RenderObject&) override { return FloatRect(); }
+ static const RenderSVGResourceType s_resourceType = SolidColorResourceType;
virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
- static RenderSVGResourceType s_resourceType;
const Color& color() const { return m_color; }
void setColor(const Color& color) { m_color = color; }
