Index: Source/core/svg/SVGNumber.h |
diff --git a/Source/core/svg/SVGNumber.h b/Source/core/svg/SVGNumber.h |
index 3b74b9889d1029e627c94d4885602b332a5146fe..a83e380dbe805de04087620db0f47720c1c8f6ff 100644 |
--- a/Source/core/svg/SVGNumber.h |
+++ b/Source/core/svg/SVGNumber.h |
@@ -33,13 +33,13 @@ |
#include "bindings/v8/ExceptionMessages.h" |
#include "bindings/v8/ExceptionStatePlaceholder.h" |
-#include "core/svg/properties/NewSVGProperty.h" |
+#include "core/svg/properties/SVGProperty.h" |
namespace WebCore { |
class SVGNumberTearOff; |
-class SVGNumber : public NewSVGPropertyBase { |
+class SVGNumber : public SVGPropertyBase { |
public: |
// SVGNumber has a tear-off type, but SVGAnimatedNumber uses primitive type. |
typedef SVGNumberTearOff TearOffType; |
@@ -51,7 +51,7 @@ public: |
} |
virtual PassRefPtr<SVGNumber> clone() const; |
- virtual PassRefPtr<NewSVGPropertyBase> cloneForAnimation(const String&) const OVERRIDE; |
+ virtual PassRefPtr<SVGPropertyBase> cloneForAnimation(const String&) const OVERRIDE; |
float value() const { return m_value; } |
void setValue(float value) { m_value = value; } |
@@ -59,9 +59,9 @@ public: |
virtual String valueAsString() const OVERRIDE; |
virtual void setValueAsString(const String&, ExceptionState&); |
- virtual void add(PassRefPtr<NewSVGPropertyBase>, SVGElement*) OVERRIDE; |
- virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<NewSVGPropertyBase> from, PassRefPtr<NewSVGPropertyBase> to, PassRefPtr<NewSVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) OVERRIDE; |
- virtual float calculateDistance(PassRefPtr<NewSVGPropertyBase> to, SVGElement* contextElement) OVERRIDE; |
+ virtual void add(PassRefPtr<SVGPropertyBase>, SVGElement*) OVERRIDE; |
+ virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRefPtr<SVGPropertyBase> to, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) OVERRIDE; |
+ virtual float calculateDistance(PassRefPtr<SVGPropertyBase> to, SVGElement* contextElement) OVERRIDE; |
static AnimatedPropertyType classType() { return AnimatedNumber; } |
@@ -74,9 +74,9 @@ protected: |
float m_value; |
}; |
-inline PassRefPtr<SVGNumber> toSVGNumber(PassRefPtr<NewSVGPropertyBase> passBase) |
+inline PassRefPtr<SVGNumber> toSVGNumber(PassRefPtr<SVGPropertyBase> passBase) |
{ |
- RefPtr<NewSVGPropertyBase> base = passBase; |
+ RefPtr<SVGPropertyBase> base = passBase; |
ASSERT(base->type() == SVGNumber::classType()); |
return static_pointer_cast<SVGNumber>(base.release()); |
} |