diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/svg/SVGAnimatedNumberList.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedNumberList.h')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimatedNumberList.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedNumberList.h b/Source/WebCore/svg/SVGAnimatedNumberList.h index 031856354..aad51a04f 100644 --- a/Source/WebCore/svg/SVGAnimatedNumberList.h +++ b/Source/WebCore/svg/SVGAnimatedNumberList.h @@ -17,21 +17,20 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGAnimatedNumberList_h -#define SVGAnimatedNumberList_h +#pragma once -#if ENABLE(SVG) #include "SVGAnimatedListPropertyTearOff.h" #include "SVGAnimatedTypeAnimator.h" +#include "SVGNumber.h" #include "SVGNumberList.h" namespace WebCore { -typedef SVGAnimatedListPropertyTearOff<SVGNumberList> SVGAnimatedNumberList; +using SVGAnimatedNumberList = SVGAnimatedListPropertyTearOff<SVGNumberListValues>; // Helper macros to declare/define a SVGAnimatedNumberList object #define DECLARE_ANIMATED_NUMBER_LIST(UpperProperty, LowerProperty) \ -DECLARE_ANIMATED_LIST_PROPERTY(SVGAnimatedNumberList, SVGNumberList, UpperProperty, LowerProperty) +DECLARE_ANIMATED_LIST_PROPERTY(SVGAnimatedNumberList, SVGNumberListValues, UpperProperty, LowerProperty) #define DEFINE_ANIMATED_NUMBER_LIST(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \ DEFINE_ANIMATED_PROPERTY(AnimatedNumberList, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty) @@ -42,19 +41,16 @@ class SVGAnimatedNumberListAnimator final : public SVGAnimatedTypeAnimator { public: SVGAnimatedNumberListAnimator(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 |