| Index: Source/core/svg/SVGAnimatedType.h
|
| diff --git a/Source/core/svg/SVGAnimatedType.h b/Source/core/svg/SVGAnimatedType.h
|
| index 2b5335221f66f48e479c663552bcdbb11ef9cf3f..665af66d12bfb4234053e8e3d5643b2f3f003760 100644
|
| --- a/Source/core/svg/SVGAnimatedType.h
|
| +++ b/Source/core/svg/SVGAnimatedType.h
|
| @@ -20,10 +20,7 @@
|
| #ifndef SVGAnimatedType_h
|
| #define SVGAnimatedType_h
|
|
|
| -#include "core/css/StyleColor.h"
|
| #include "core/svg/SVGAngle.h"
|
| -#include "core/svg/SVGColor.h"
|
| -#include "core/svg/SVGTransformList.h"
|
| #include "core/svg/properties/NewSVGAnimatedProperty.h"
|
| #include "core/svg/properties/SVGPropertyInfo.h"
|
|
|
| @@ -37,12 +34,10 @@ public:
|
| ~SVGAnimatedType();
|
|
|
| static PassOwnPtr<SVGAnimatedType> createAngleAndEnumeration(std::pair<SVGAngle, unsigned>*);
|
| - static PassOwnPtr<SVGAnimatedType> createColor(StyleColor*);
|
| static PassOwnPtr<SVGAnimatedType> createEnumeration(unsigned*);
|
| static PassOwnPtr<SVGAnimatedType> createInteger(int*);
|
| static PassOwnPtr<SVGAnimatedType> createIntegerOptionalInteger(std::pair<int, int>*);
|
| static PassOwnPtr<SVGAnimatedType> createPath(PassOwnPtr<SVGPathByteStream>);
|
| - 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 bool supportsAnimVal(AnimatedPropertyType);
|
| @@ -55,12 +50,6 @@ public:
|
| return *m_data.angleAndEnumeration;
|
| }
|
|
|
| - StyleColor& color()
|
| - {
|
| - ASSERT(m_type == AnimatedColor);
|
| - return *m_data.color;
|
| - }
|
| -
|
| unsigned& enumeration()
|
| {
|
| ASSERT(m_type == AnimatedEnumeration);
|
| @@ -85,12 +74,6 @@ public:
|
| return m_data.path;
|
| }
|
|
|
| - SVGTransformList& transformList()
|
| - {
|
| - ASSERT(m_type == AnimatedTransformList);
|
| - return *m_data.transformList;
|
| - }
|
| -
|
| RefPtr<NewSVGPropertyBase>& newProperty()
|
| {
|
| ASSERT(m_newProperty);
|
| @@ -111,12 +94,10 @@ private:
|
| }
|
|
|
| std::pair<SVGAngle, unsigned>* angleAndEnumeration;
|
| - StyleColor* color;
|
| unsigned* enumeration;
|
| int* integer;
|
| std::pair<int, int>* integerOptionalInteger;
|
| SVGPathByteStream* path;
|
| - SVGTransformList* transformList;
|
| } m_data;
|
| RefPtr<NewSVGPropertyBase> m_newProperty;
|
| };
|
|
|