diff options
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedNumber.h')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimatedNumber.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedNumber.h b/Source/WebCore/svg/SVGAnimatedNumber.h index cadf442f5..55eb121f3 100644 --- a/Source/WebCore/svg/SVGAnimatedNumber.h +++ b/Source/WebCore/svg/SVGAnimatedNumber.h @@ -17,10 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGAnimatedNumber_h -#define SVGAnimatedNumber_h +#pragma once -#if ENABLE(SVG) #include "SVGAnimatedPropertyMacros.h" #include "SVGAnimatedStaticPropertyTearOff.h" #include "SVGAnimatedTypeAnimator.h" @@ -31,7 +29,7 @@ typedef SVGAnimatedStaticPropertyTearOff<float> SVGAnimatedNumber; // 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) @@ -45,19 +43,16 @@ class SVGAnimatedNumberAnimator final : public SVGAnimatedTypeAnimator { public: SVGAnimatedNumberAnimator(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 |