diff options
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedLengthList.h')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimatedLengthList.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedLengthList.h b/Source/WebCore/svg/SVGAnimatedLengthList.h index d79e99407..f3619a00e 100644 --- a/Source/WebCore/svg/SVGAnimatedLengthList.h +++ b/Source/WebCore/svg/SVGAnimatedLengthList.h @@ -17,21 +17,20 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGAnimatedLengthList_h -#define SVGAnimatedLengthList_h +#pragma once -#if ENABLE(SVG) #include "SVGAnimatedListPropertyTearOff.h" #include "SVGAnimatedTypeAnimator.h" +#include "SVGLength.h" #include "SVGLengthList.h" namespace WebCore { -typedef SVGAnimatedListPropertyTearOff<SVGLengthList> SVGAnimatedLengthList; +using SVGAnimatedLengthList = SVGAnimatedListPropertyTearOff<SVGLengthListValues>; // Helper macros to declare/define a SVGAnimatedLengthList object #define DECLARE_ANIMATED_LENGTH_LIST(UpperProperty, LowerProperty) \ -DECLARE_ANIMATED_LIST_PROPERTY(SVGAnimatedLengthList, SVGLengthList, UpperProperty, LowerProperty) +DECLARE_ANIMATED_LIST_PROPERTY(SVGAnimatedLengthList, SVGLengthListValues, UpperProperty, LowerProperty) #define DEFINE_ANIMATED_LENGTH_LIST(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \ DEFINE_ANIMATED_PROPERTY(AnimatedLengthList, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty) @@ -42,22 +41,19 @@ class SVGAnimatedLengthListAnimator final : public SVGAnimatedTypeAnimator { public: SVGAnimatedLengthListAnimator(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: SVGLengthMode m_lengthMode; }; } // namespace WebCore - -#endif // ENABLE(SVG) -#endif |