diff options
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedString.h')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimatedString.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedString.h b/Source/WebCore/svg/SVGAnimatedString.h index bf4d87b00..2c8c33546 100644 --- a/Source/WebCore/svg/SVGAnimatedString.h +++ b/Source/WebCore/svg/SVGAnimatedString.h @@ -17,10 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGAnimatedString_h -#define SVGAnimatedString_h +#pragma once -#if ENABLE(SVG) #include "SVGAnimatedPropertyMacros.h" #include "SVGAnimatedStaticPropertyTearOff.h" #include "SVGAnimatedTypeAnimator.h" @@ -31,7 +29,10 @@ typedef SVGAnimatedStaticPropertyTearOff<String> SVGAnimatedString; // 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) @@ -42,19 +43,16 @@ class SVGAnimatedStringAnimator final : public SVGAnimatedTypeAnimator { public: SVGAnimatedStringAnimator(SVGAnimationElement*, SVGElement*); - virtual std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override; - virtual std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override; - virtual void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override; - virtual void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType*) override; - virtual void animValWillChange(const SVGElementAnimatedPropertyList&) override; - virtual void animValDidChange(const SVGElementAnimatedPropertyList&) override; + std::unique_ptr<SVGAnimatedType> constructFromString(const String&) override; + std::unique_ptr<SVGAnimatedType> startAnimValAnimation(const SVGElementAnimatedPropertyList&) override; + void stopAnimValAnimation(const SVGElementAnimatedPropertyList&) override; + void resetAnimValToBaseVal(const SVGElementAnimatedPropertyList&, SVGAnimatedType&) override; + void animValWillChange(const SVGElementAnimatedPropertyList&) override; + void animValDidChange(const SVGElementAnimatedPropertyList&) override; - virtual void addAnimatedTypes(SVGAnimatedType*, SVGAnimatedType*) override; - virtual void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*) override; - virtual float calculateDistance(const String& fromString, const String& toString) override; + void addAnimatedTypes(SVGAnimatedType*, SVGAnimatedType*) override; + void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*, SVGAnimatedType*) override; + float calculateDistance(const String& fromString, const String& toString) override; }; } // namespace WebCore - -#endif // ENABLE(SVG) -#endif |