Diff
Modified: trunk/Source/WebCore/ChangeLog (185502 => 185503)
--- trunk/Source/WebCore/ChangeLog 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/ChangeLog 2015-06-12 13:44:43 UTC (rev 185503)
@@ -1,5 +1,78 @@
2015-06-12 Zan Dobersek <[email protected]>
+ Add missing override specifiers under Source/WebCore/svg/
+ https://bugs.webkit.org/show_bug.cgi?id=145841
+
+ Reviewed by Darin Adler.
+
+ Add missing override specifiers to virtual method overrides for classes
+ under Source/WebCore/svg/, suppressing a bunch of warnings when compiling
+ with Clang 3.6.
+
+ Add the BEGIN_DECLARE_ANIMATED_PROPERTIES_BASE() macro that doesn't
+ override the localAttributeToPropertyMap() method declaration, and
+ have the BEGIN_DECLARE_ANIMATED_PROPERTIES() macro add the override
+ specifier. The new macro is used in SVGElement.
+
+ Change the DECLARE_ANIMATED_PROPERTY() to accept the optional override
+ specifier as the fifth parameter. Current DECLARE_ANIMATED_*() macros
+ are modified to just pass an empty argument, not adding any specifier.
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE() and DECLARE_ANIMATED_STRING_OVERRIDE()
+ macros are added to override the methods for the externalResourcesRequired
+ and href animated properties, where required.
+
+ * svg/SVGAElement.h:
+ * svg/SVGAltGlyphElement.h:
+ * svg/SVGAnimatedAngle.h:
+ * svg/SVGAnimatedBoolean.h:
+ * svg/SVGAnimatedEnumeration.h:
+ * svg/SVGAnimatedInteger.h:
+ * svg/SVGAnimatedLength.h:
+ * svg/SVGAnimatedNumber.h:
+ * svg/SVGAnimatedPreserveAspectRatio.h:
+ * svg/SVGAnimatedRect.h:
+ * svg/SVGAnimatedString.h:
+ * svg/SVGAnimationElement.h:
+ * svg/SVGCircleElement.h:
+ * svg/SVGClipPathElement.h:
+ * svg/SVGCursorElement.h:
+ * svg/SVGDefsElement.h:
+ * svg/SVGElement.h:
+ * svg/SVGEllipseElement.h:
+ * svg/SVGFEImageElement.h:
+ * svg/SVGFilterElement.h:
+ * svg/SVGFontElement.h:
+ * svg/SVGForeignObjectElement.h:
+ * svg/SVGGElement.h:
+ * svg/SVGGlyphRefElement.h:
+ * svg/SVGGradientElement.h:
+ * svg/SVGImageElement.h:
+ * svg/SVGLineElement.h:
+ * svg/SVGMPathElement.h:
+ * svg/SVGMarkerElement.h:
+ * svg/SVGMaskElement.h:
+ * svg/SVGPathElement.h:
+ * svg/SVGPatternElement.h:
+ * svg/SVGPolyElement.h:
+ * svg/SVGRectElement.h:
+ * svg/SVGSVGElement.h:
+ * svg/SVGScriptElement.h:
+ * svg/SVGSwitchElement.h:
+ * svg/SVGSymbolElement.h:
+ * svg/SVGTRefElement.h:
+ * svg/SVGTextContentElement.h:
+ * svg/SVGTextPathElement.h:
+ * svg/SVGURIReference.h: Add the hrefBaseValue() pure virtual method
+ so it can be overridden by any class that also overrides the
+ corresponding setHrefBaseValue() method.
+ * svg/SVGUseElement.h:
+ * svg/SVGViewElement.h:
+ * svg/properties/SVGAnimatedPropertyMacros.h:
+ * svg/properties/SVGMatrixTearOff.h:
+ (WebCore::SVGMatrixTearOff::commitChange):
+
+2015-06-12 Zan Dobersek <[email protected]>
+
[GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
https://bugs.webkit.org/show_bug.cgi?id=145799
Modified: trunk/Source/WebCore/svg/SVGAElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -65,8 +65,8 @@
// This declaration used to define a non-virtual "String& target() const" method, that clashes with "virtual String Element::target() const".
// That's why it has been renamed to "svgTarget", the CodeGenerators take care of calling svgTargetAnimated() instead of targetAnimated(), see CodeGenerator.pm.
DECLARE_ANIMATED_STRING(SVGTarget, svgTarget)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGAltGlyphElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAltGlyphElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAltGlyphElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -51,7 +51,7 @@
virtual bool childShouldCreateRenderer(const Node&) const override;
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGAltGlyphElement)
- DECLARE_ANIMATED_STRING(Href, href)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGAnimatedAngle.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedAngle.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedAngle.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,7 +30,7 @@
// Helper macros to declare/define a SVGAnimatedAngle object. SVGAnimatedAngle is only used in the SVG DOM for SVGMarkerElement.
#define DECLARE_ANIMATED_ANGLE(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedAngle, SVGAngle, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedAngle, SVGAngle, UpperProperty, LowerProperty, )
// Only used for SVGMarkerElements orientAttr, which maps to SVGAnimatedAngle orientAngle and SVGAnimatedEnumeration orientType.
#define DEFINE_ANIMATED_ANGLE_AND_ENUMERATION(OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty) \
Modified: trunk/Source/WebCore/svg/SVGAnimatedBoolean.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedBoolean.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedBoolean.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -29,8 +29,11 @@
// Helper macros to declare/define a SVGAnimatedBoolean object
#define DECLARE_ANIMATED_BOOLEAN(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedBoolean, bool, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedBoolean, bool, UpperProperty, LowerProperty, )
+#define DECLARE_ANIMATED_BOOLEAN_OVERRIDE(UpperProperty, LowerProperty) \
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedBoolean, bool, UpperProperty, LowerProperty, override)
+
#define DEFINE_ANIMATED_BOOLEAN(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedBoolean, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedEnumeration.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedEnumeration.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedEnumeration.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,7 +30,7 @@
// Helper macros to declare/define a SVGAnimatedEnumeration object
#define DECLARE_ANIMATED_ENUMERATION(UpperProperty, LowerProperty, EnumType) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedEnumerationPropertyTearOff<EnumType>, EnumType, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedEnumerationPropertyTearOff<EnumType>, EnumType, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_ENUMERATION(OwnerType, DOMAttribute, UpperProperty, LowerProperty, EnumType) \
DEFINE_ANIMATED_PROPERTY(AnimatedEnumeration, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedInteger.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedInteger.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedInteger.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,7 +30,7 @@
// Helper macros to declare/define a SVGAnimatedInteger object
#define DECLARE_ANIMATED_INTEGER(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedInteger, int, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedInteger, int, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_INTEGER(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedInteger, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedLength.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedLength.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedLength.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,7 +30,7 @@
// Helper macros to declare/define a SVGAnimatedLength object
#define DECLARE_ANIMATED_LENGTH(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedLength, SVGLength, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedLength, SVGLength, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_LENGTH(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedLength, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedNumber.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedNumber.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedNumber.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,7 +30,7 @@
// Helper macros to declare/define a SVGAnimatedNumber object
#define DECLARE_ANIMATED_NUMBER(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedNumber, float, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedNumber, float, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_NUMBER(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedNumber, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedPreserveAspectRatio.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,7 +30,7 @@
// Helper macros to declare/define a SVGAnimatedPreserveAspectRatio object
#define DECLARE_ANIMATED_PRESERVEASPECTRATIO(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedPreserveAspectRatio, SVGPreserveAspectRatio, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedPreserveAspectRatio, SVGPreserveAspectRatio, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_PRESERVEASPECTRATIO(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedPreserveAspectRatio, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedRect.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedRect.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedRect.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -31,7 +31,7 @@
// Helper macros to declare/define a SVGAnimatedRect object
#define DECLARE_ANIMATED_RECT(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedRect, FloatRect, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedRect, FloatRect, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_RECT(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedRect, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimatedString.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimatedString.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimatedString.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -30,8 +30,11 @@
// Helper macros to declare/define a SVGAnimatedString object
#define DECLARE_ANIMATED_STRING(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedString, String, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedString, String, UpperProperty, LowerProperty, )
+#define DECLARE_ANIMATED_STRING_OVERRIDE(UpperProperty, LowerProperty) \
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedString, String, UpperProperty, LowerProperty, override)
+
#define DEFINE_ANIMATED_STRING(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedString, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
Modified: trunk/Source/WebCore/svg/SVGAnimationElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGAnimationElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGAnimationElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -225,7 +225,7 @@
void adjustForInheritance(SVGElement* targetElement, const QualifiedName& attributeName, String&);
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGAnimationElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
// SVGTests
Modified: trunk/Source/WebCore/svg/SVGCircleElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGCircleElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGCircleElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -49,7 +49,7 @@
DECLARE_ANIMATED_LENGTH(Cx, cx)
DECLARE_ANIMATED_LENGTH(Cy, cy)
DECLARE_ANIMATED_LENGTH(R, r)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGClipPathElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGClipPathElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGClipPathElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -52,7 +52,7 @@
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGClipPathElement)
DECLARE_ANIMATED_ENUMERATION(ClipPathUnits, clipPathUnits, SVGUnitTypes::SVGUnitType)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGCursorElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGCursorElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGCursorElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -60,8 +60,8 @@
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGCursorElement)
DECLARE_ANIMATED_LENGTH(X, x)
DECLARE_ANIMATED_LENGTH(Y, y)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
// SVGTests
Modified: trunk/Source/WebCore/svg/SVGDefsElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGDefsElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGDefsElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -41,7 +41,7 @@
virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGDefsElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -207,7 +207,7 @@
HashSet<SVGElement*> m_elementsWithRelativeLengths;
- BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGElement)
+ BEGIN_DECLARE_ANIMATED_PROPERTIES_BASE(SVGElement)
DECLARE_ANIMATED_STRING(ClassName, className)
END_DECLARE_ANIMATED_PROPERTIES
Modified: trunk/Source/WebCore/svg/SVGEllipseElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGEllipseElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGEllipseElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -50,7 +50,7 @@
DECLARE_ANIMATED_LENGTH(Cy, cy)
DECLARE_ANIMATED_LENGTH(Rx, rx)
DECLARE_ANIMATED_LENGTH(Ry, ry)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGFEImageElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGFEImageElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -63,8 +63,8 @@
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFEImageElement)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
CachedResourceHandle<CachedImage> m_cachedImage;
Modified: trunk/Source/WebCore/svg/SVGFilterElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGFilterElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGFilterElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -70,8 +70,8 @@
DECLARE_ANIMATED_LENGTH(Height, height)
DECLARE_ANIMATED_INTEGER(FilterResX, filterResX)
DECLARE_ANIMATED_INTEGER(FilterResY, filterResY)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGFontElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGFontElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGFontElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -92,7 +92,7 @@
void registerLigaturesInGlyphCache(Vector<String>&);
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFontElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
SVGKerningMap m_horizontalKerningMap;
Modified: trunk/Source/WebCore/svg/SVGForeignObjectElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGForeignObjectElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGForeignObjectElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -54,7 +54,7 @@
DECLARE_ANIMATED_LENGTH(Width, width)
DECLARE_ANIMATED_LENGTH(Height, height)
DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGGElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGGElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGGElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -47,7 +47,7 @@
virtual bool rendererIsNeeded(const RenderStyle&) override;
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGGElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGGlyphRefElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGGlyphRefElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGGlyphRefElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -52,7 +52,7 @@
virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGGlyphRefElement)
- DECLARE_ANIMATED_STRING(Href, href)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
END_DECLARE_ANIMATED_PROPERTIES
float m_x;
Modified: trunk/Source/WebCore/svg/SVGGradientElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGGradientElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGGradientElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -102,8 +102,8 @@
DECLARE_ANIMATED_ENUMERATION(SpreadMethod, spreadMethod, SVGSpreadMethodType)
DECLARE_ANIMATED_ENUMERATION(GradientUnits, gradientUnits, SVGUnitTypes::SVGUnitType)
DECLARE_ANIMATED_TRANSFORM_LIST(GradientTransform, gradientTransform)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGImageElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGImageElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGImageElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -65,8 +65,8 @@
DECLARE_ANIMATED_LENGTH(Width, width)
DECLARE_ANIMATED_LENGTH(Height, height)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
SVGImageLoader m_imageLoader;
Modified: trunk/Source/WebCore/svg/SVGLineElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGLineElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGLineElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -51,7 +51,7 @@
DECLARE_ANIMATED_LENGTH(Y1, y1)
DECLARE_ANIMATED_LENGTH(X2, x2)
DECLARE_ANIMATED_LENGTH(Y2, y2)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGMPathElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGMPathElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGMPathElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -58,8 +58,8 @@
void notifyParentOfPathChange(ContainerNode*);
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGMPathElement)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGMarkerElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGMarkerElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGMarkerElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -149,7 +149,7 @@
DECLARE_ANIMATED_LENGTH(MarkerHeight, markerHeight)
DECLARE_ANIMATED_ENUMERATION(MarkerUnits, markerUnits, SVGMarkerUnitsType)
DECLARE_ANIMATED_ANGLE(OrientAngle, orientAngle)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
DECLARE_ANIMATED_RECT(ViewBox, viewBox)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
END_DECLARE_ANIMATED_PROPERTIES
Modified: trunk/Source/WebCore/svg/SVGMaskElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGMaskElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGMaskElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -66,7 +66,7 @@
DECLARE_ANIMATED_LENGTH(Y, y)
DECLARE_ANIMATED_LENGTH(Width, width)
DECLARE_ANIMATED_LENGTH(Height, height)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
// SVGTests
Modified: trunk/Source/WebCore/svg/SVGPathElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGPathElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGPathElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -113,7 +113,7 @@
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGPathElement)
DECLARE_ANIMATED_NUMBER(PathLength, pathLength)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
Modified: trunk/Source/WebCore/svg/SVGPatternElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGPatternElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGPatternElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -74,8 +74,8 @@
DECLARE_ANIMATED_ENUMERATION(PatternUnits, patternUnits, SVGUnitTypes::SVGUnitType)
DECLARE_ANIMATED_ENUMERATION(PatternContentUnits, patternContentUnits, SVGUnitTypes::SVGUnitType)
DECLARE_ANIMATED_TRANSFORM_LIST(PatternTransform, patternTransform)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
DECLARE_ANIMATED_RECT(ViewBox, viewBox)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
END_DECLARE_ANIMATED_PROPERTIES
Modified: trunk/Source/WebCore/svg/SVGPolyElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGPolyElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGPolyElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -54,7 +54,7 @@
static Ref<SVGAnimatedProperty> lookupOrCreatePointsWrapper(SVGElement* contextElement);
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGPolyElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
protected:
Modified: trunk/Source/WebCore/svg/SVGRectElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGRectElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGRectElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -53,7 +53,7 @@
DECLARE_ANIMATED_LENGTH(Height, height)
DECLARE_ANIMATED_LENGTH(Rx, rx)
DECLARE_ANIMATED_LENGTH(Ry, ry)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGSVGElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGSVGElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGSVGElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -43,7 +43,7 @@
DECLARE_ANIMATED_LENGTH(Y, y)
DECLARE_ANIMATED_LENGTH(Width, width)
DECLARE_ANIMATED_LENGTH(Height, height)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
DECLARE_ANIMATED_RECT(ViewBox, viewBox)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
END_DECLARE_ANIMATED_PROPERTIES
Modified: trunk/Source/WebCore/svg/SVGScriptElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGScriptElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGScriptElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -78,8 +78,8 @@
#endif
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGScriptElement)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
Timer m_svgLoadEventTimer;
Modified: trunk/Source/WebCore/svg/SVGSwitchElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGSwitchElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGSwitchElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -41,7 +41,7 @@
virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGSwitchElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGSymbolElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGSymbolElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGSymbolElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -46,7 +46,7 @@
virtual bool selfHasRelativeLengths() const override;
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGSymbolElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
DECLARE_ANIMATED_RECT(ViewBox, viewBox)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
END_DECLARE_ANIMATED_PROPERTIES
Modified: trunk/Source/WebCore/svg/SVGTRefElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGTRefElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGTRefElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -58,7 +58,7 @@
virtual void buildPendingResource() override;
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGTRefElement)
- DECLARE_ANIMATED_STRING(Href, href)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
END_DECLARE_ANIMATED_PROPERTIES
Ref<SVGTRefTargetEventListener> m_targetListener;
Modified: trunk/Source/WebCore/svg/SVGTextContentElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGTextContentElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGTextContentElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -116,7 +116,7 @@
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGTextContentElement)
DECLARE_ANIMATED_ENUMERATION(LengthAdjust, lengthAdjust, SVGLengthAdjustType)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGTextPathElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGTextPathElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGTextPathElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -139,7 +139,7 @@
DECLARE_ANIMATED_LENGTH(StartOffset, startOffset)
DECLARE_ANIMATED_ENUMERATION(Method, method, SVGTextPathMethodType)
DECLARE_ANIMATED_ENUMERATION(Spacing, spacing, SVGTextPathSpacingType)
- DECLARE_ANIMATED_STRING(Href, href)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
END_DECLARE_ANIMATED_PROPERTIES
};
Modified: trunk/Source/WebCore/svg/SVGURIReference.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGURIReference.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGURIReference.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -50,6 +50,7 @@
}
protected:
+ virtual String& hrefBaseValue() const = 0;
virtual void setHrefBaseValue(const String&, const bool validValue = true) = 0;
};
Modified: trunk/Source/WebCore/svg/SVGUseElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGUseElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGUseElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -42,8 +42,8 @@
DECLARE_ANIMATED_LENGTH(Y, y)
DECLARE_ANIMATED_LENGTH(Width, width)
DECLARE_ANIMATED_LENGTH(Height, height)
- DECLARE_ANIMATED_STRING(Href, href)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_STRING_OVERRIDE(Href, href)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
END_DECLARE_ANIMATED_PROPERTIES
public:
Modified: trunk/Source/WebCore/svg/SVGViewElement.h (185502 => 185503)
--- trunk/Source/WebCore/svg/SVGViewElement.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/SVGViewElement.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -55,7 +55,7 @@
virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGViewElement)
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
+ DECLARE_ANIMATED_BOOLEAN_OVERRIDE(ExternalResourcesRequired, externalResourcesRequired)
DECLARE_ANIMATED_RECT(ViewBox, viewBox)
DECLARE_ANIMATED_PRESERVEASPECTRATIO(PreserveAspectRatio, preserveAspectRatio)
END_DECLARE_ANIMATED_PROPERTIES
Modified: trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h (185502 => 185503)
--- trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/properties/SVGAnimatedPropertyMacros.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -100,7 +100,7 @@
}
// Property declaration helpers (used in SVG*.h files)
-#define BEGIN_DECLARE_ANIMATED_PROPERTIES(OwnerType) \
+#define BEGIN_DECLARE_ANIMATED_PROPERTIES_BASE(OwnerType) \
public: \
static SVGAttributeToPropertyMap& attributeToPropertyMap(); \
virtual SVGAttributeToPropertyMap& localAttributeToPropertyMap() \
@@ -109,8 +109,17 @@
} \
typedef OwnerType UseOwnerType;
-#define DECLARE_ANIMATED_PROPERTY(TearOffType, PropertyType, UpperProperty, LowerProperty) \
+#define BEGIN_DECLARE_ANIMATED_PROPERTIES(OwnerType) \
public: \
+ static SVGAttributeToPropertyMap& attributeToPropertyMap(); \
+ SVGAttributeToPropertyMap& localAttributeToPropertyMap() override \
+ { \
+ return attributeToPropertyMap(); \
+ } \
+ typedef OwnerType UseOwnerType;
+
+#define DECLARE_ANIMATED_PROPERTY(TearOffType, PropertyType, UpperProperty, LowerProperty, OverrideSpecifier) \
+public: \
static const SVGPropertyInfo* LowerProperty##PropertyInfo(); \
PropertyType& LowerProperty() const \
{ \
@@ -121,12 +130,12 @@
return m_##LowerProperty.value; \
} \
\
- PropertyType& LowerProperty##BaseValue() const \
+ PropertyType& LowerProperty##BaseValue() const OverrideSpecifier \
{ \
return m_##LowerProperty.value; \
} \
\
- void set##UpperProperty##BaseValue(const PropertyType& type, const bool validValue = true) \
+ void set##UpperProperty##BaseValue(const PropertyType& type, const bool validValue = true) OverrideSpecifier \
{ \
m_##LowerProperty.value = type; \
m_##LowerProperty.isValid = validValue; \
@@ -172,7 +181,7 @@
// List specific definition/declaration helpers
#define DECLARE_ANIMATED_LIST_PROPERTY(TearOffType, PropertyType, UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(TearOffType, PropertyType, UpperProperty, LowerProperty) \
+DECLARE_ANIMATED_PROPERTY(TearOffType, PropertyType, UpperProperty, LowerProperty, ) \
void detachAnimated##UpperProperty##ListWrappers(unsigned newListSize) \
{ \
if (TearOffType* wrapper = SVGAnimatedProperty::lookupWrapper<UseOwnerType, TearOffType>(this, LowerProperty##PropertyInfo())) \
Modified: trunk/Source/WebCore/svg/properties/SVGMatrixTearOff.h (185502 => 185503)
--- trunk/Source/WebCore/svg/properties/SVGMatrixTearOff.h 2015-06-12 13:32:03 UTC (rev 185502)
+++ trunk/Source/WebCore/svg/properties/SVGMatrixTearOff.h 2015-06-12 13:44:43 UTC (rev 185503)
@@ -42,7 +42,7 @@
virtual void setValue(SVGMatrix& value) override { m_parent->propertyReference().setMatrix(value); }
- virtual void commitChange()
+ virtual void commitChange() override
{
m_parent->propertyReference().updateSVGMatrix();
m_parent->commitChange();
