Index: Source/core/svg/SVGAnimatedType.h |
diff --git a/Source/core/svg/SVGAnimatedType.h b/Source/core/svg/SVGAnimatedType.h |
index 83880c3bd79eb6a2730c716e151df02790f2d445..c3045d9481dd1d73bd29d48abe16ff101392bfea 100644 |
--- a/Source/core/svg/SVGAnimatedType.h |
+++ b/Source/core/svg/SVGAnimatedType.h |
@@ -22,8 +22,6 @@ |
#include "core/svg/SVGAngle.h" |
#include "core/svg/SVGColor.h" |
-#include "core/svg/SVGLength.h" |
-#include "core/svg/SVGLengthList.h" |
#include "core/svg/SVGNumberList.h" |
#include "core/svg/SVGPointList.h" |
#include "core/svg/SVGPreserveAspectRatio.h" |
@@ -47,8 +45,6 @@ public: |
static PassOwnPtr<SVGAnimatedType> createEnumeration(unsigned*); |
static PassOwnPtr<SVGAnimatedType> createInteger(int*); |
static PassOwnPtr<SVGAnimatedType> createIntegerOptionalInteger(std::pair<int, int>*); |
- static PassOwnPtr<SVGAnimatedType> createLength(SVGLength*); |
- static PassOwnPtr<SVGAnimatedType> createLengthList(SVGLengthList*); |
static PassOwnPtr<SVGAnimatedType> createNumber(float*); |
static PassOwnPtr<SVGAnimatedType> createNumberList(SVGNumberList*); |
static PassOwnPtr<SVGAnimatedType> createNumberOptionalNumber(std::pair<float, float>*); |
@@ -59,7 +55,7 @@ public: |
static PassOwnPtr<SVGAnimatedType> createString(String*); |
static PassOwnPtr<SVGAnimatedType> createTransformList(SVGTransformList*); |
// Temporary compatibility layer. This shouldn't be needed after all properties are switched to NewSVGAnimatedProperty impl. |
- static PassOwnPtr<SVGAnimatedType> createNewProperty(PassRefPtr<NewSVGPropertyBase>); |
+ static PassOwnPtr<SVGAnimatedType> createNewProperty(PassRefPtr<NewSVGPropertyBase>, AnimatedPropertyType); |
static bool supportsAnimVal(AnimatedPropertyType); |
AnimatedPropertyType type() const { return m_type; } |
@@ -100,18 +96,6 @@ public: |
return *m_data.integerOptionalInteger; |
} |
- SVGLength& length() |
- { |
- ASSERT(m_type == AnimatedLength); |
- return *m_data.length; |
- } |
- |
- SVGLengthList& lengthList() |
- { |
- ASSERT(m_type == AnimatedLengthList); |
- return *m_data.lengthList; |
- } |
- |
float& number() |
{ |
ASSERT(m_type == AnimatedNumber); |
@@ -168,7 +152,6 @@ public: |
RefPtr<NewSVGPropertyBase>& newProperty() |
{ |
- ASSERT(m_type == AnimatedNewProperty); |
ASSERT(m_newProperty); |
return m_newProperty; |
} |
@@ -183,7 +166,6 @@ private: |
union DataUnion { |
DataUnion() |
- : length(0) |
{ |
} |
@@ -193,8 +175,6 @@ private: |
unsigned* enumeration; |
int* integer; |
std::pair<int, int>* integerOptionalInteger; |
- SVGLength* length; |
- SVGLengthList* lengthList; |
float* number; |
SVGNumberList* numberList; |
std::pair<float, float>* numberOptionalNumber; |