summaryrefslogtreecommitdiff
path: root/Source/WebCore/svg/SVGAnimatedInteger.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/svg/SVGAnimatedInteger.h')
-rw-r--r--Source/WebCore/svg/SVGAnimatedInteger.h27
1 files changed, 11 insertions, 16 deletions
diff --git a/Source/WebCore/svg/SVGAnimatedInteger.h b/Source/WebCore/svg/SVGAnimatedInteger.h
index 9245d40a1..a62a472e9 100644
--- a/Source/WebCore/svg/SVGAnimatedInteger.h
+++ b/Source/WebCore/svg/SVGAnimatedInteger.h
@@ -17,10 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SVGAnimatedInteger_h
-#define SVGAnimatedInteger_h
+#pragma once
-#if ENABLE(SVG)
#include "SVGAnimatedPropertyMacros.h"
#include "SVGAnimatedStaticPropertyTearOff.h"
#include "SVGAnimatedTypeAnimator.h"
@@ -31,7 +29,7 @@ typedef SVGAnimatedStaticPropertyTearOff<int> SVGAnimatedInteger;
// Helper macros to declare/define a SVGAnimatedInteger object
#define DECLARE_ANIMATED_INTEGER(UpperProperty, LowerProperty) \
-DECLARE_ANIMATED_PROPERTY(SVGAnimatedInteger, int, UpperProperty, LowerProperty)
+DECLARE_ANIMATED_PROPERTY(SVGAnimatedInteger, int, UpperProperty, LowerProperty, )
#define DEFINE_ANIMATED_INTEGER(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(AnimatedInteger, OwnerType, DOMAttribute, DOMAttribute.localName(), UpperProperty, LowerProperty)
@@ -47,19 +45,16 @@ public:
static void calculateAnimatedInteger(SVGAnimationElement*, float percentage, unsigned repeatCount, int fromInteger, int toInteger, int toAtEndOfDurationInteger, int& animatedInteger);
- 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