diff options
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedAngle.h')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimatedAngle.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedAngle.h b/Source/WebCore/svg/SVGAnimatedAngle.h index a28e18b77..521178ba9 100644 --- a/Source/WebCore/svg/SVGAnimatedAngle.h +++ b/Source/WebCore/svg/SVGAnimatedAngle.h @@ -17,21 +17,19 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGAnimatedAngle_h -#define SVGAnimatedAngle_h +#pragma once -#if ENABLE(SVG) #include "SVGAngle.h" #include "SVGAnimatedPropertyTearOff.h" #include "SVGAnimatedTypeAnimator.h" namespace WebCore { -typedef SVGAnimatedPropertyTearOff<SVGAngle> SVGAnimatedAngle; +using SVGAnimatedAngle = SVGAnimatedPropertyTearOff<SVGAngle>; // 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, SVGAngleValue, 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) \ @@ -43,20 +41,17 @@ class SVGAnimatedAngleAnimator final : public SVGAnimatedTypeAnimator { public: SVGAnimatedAngleAnimator(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; + 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 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 |