diff options
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedTransformList.h')
-rw-r--r-- | Source/WebCore/svg/SVGAnimatedTransformList.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedTransformList.h b/Source/WebCore/svg/SVGAnimatedTransformList.h index 387229103..4c9022a5b 100644 --- a/Source/WebCore/svg/SVGAnimatedTransformList.h +++ b/Source/WebCore/svg/SVGAnimatedTransformList.h @@ -17,20 +17,19 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGAnimatedTransformList_h -#define SVGAnimatedTransformList_h +#pragma once -#if ENABLE(SVG) #include "SVGAnimatedTransformListPropertyTearOff.h" #include "SVGAnimatedTypeAnimator.h" +#include "SVGTransformList.h" namespace WebCore { -typedef SVGAnimatedTransformListPropertyTearOff SVGAnimatedTransformList; +using SVGAnimatedTransformList = SVGAnimatedTransformListPropertyTearOff; // Helper macros to declare/define a SVGAnimatedTransformList object #define DECLARE_ANIMATED_TRANSFORM_LIST(UpperProperty, LowerProperty) \ -DECLARE_ANIMATED_LIST_PROPERTY(SVGAnimatedTransformList, SVGTransformList, UpperProperty, LowerProperty) +DECLARE_ANIMATED_LIST_PROPERTY(SVGAnimatedTransformList, SVGTransformListValues, UpperProperty, LowerProperty) #define DEFINE_ANIMATED_TRANSFORM_LIST(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \ DEFINE_ANIMATED_PROPERTY(AnimatedTransformList, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty) @@ -41,22 +40,19 @@ class SVGAnimatedTransformListAnimator final : public SVGAnimatedTypeAnimator { public: SVGAnimatedTransformListAnimator(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; private: const String& m_transformTypeString; }; } // namespace WebCore - -#endif // ENABLE(SVG) -#endif |