| Index: Source/core/svg/SVGTextContentElement.h
|
| diff --git a/Source/core/svg/SVGTextContentElement.h b/Source/core/svg/SVGTextContentElement.h
|
| index 75da51fd6a86d48ba8e99ec83e5537a9c07df162..38848d9216d5a0aa4d66efc03adf6216548c0f9b 100644
|
| --- a/Source/core/svg/SVGTextContentElement.h
|
| +++ b/Source/core/svg/SVGTextContentElement.h
|
| @@ -65,6 +65,8 @@ struct SVGPropertyTraits<SVGLengthAdjustType> {
|
| }
|
| };
|
|
|
| +class SVGAnimatedTextLength;
|
| +
|
| class SVGTextContentElement : public SVGGraphicsElement {
|
| public:
|
| // Forward declare enumerations in the W3C naming scheme, for IDL generation.
|
| @@ -86,11 +88,8 @@ public:
|
|
|
| static SVGTextContentElement* elementFromRenderer(RenderObject*);
|
|
|
| - // textLength is not declared using the standard DECLARE_ANIMATED_LENGTH macro
|
| - // as its getter needs special handling (return getComputedTextLength(), instead of m_textLength).
|
| - SVGLength& specifiedTextLength() { return m_specifiedTextLength; }
|
| - PassRefPtr<SVGAnimatedLength> textLength();
|
| - static const SVGPropertyInfo* textLengthPropertyInfo();
|
| + SVGAnimatedLength* textLength() { return m_textLength.get(); }
|
| + bool textLengthIsSpecifiedByUser() { return m_textLengthIsSpecifiedByUser; }
|
|
|
| protected:
|
| SVGTextContentElement(const QualifiedName&, Document&);
|
| @@ -108,12 +107,8 @@ protected:
|
| private:
|
| virtual bool isTextContent() const { return true; }
|
|
|
| - // Custom 'textLength' property
|
| - static void synchronizeTextLength(SVGElement* contextElement);
|
| - static PassRefPtr<SVGAnimatedProperty> lookupOrCreateTextLengthWrapper(SVGElement* contextElement);
|
| - mutable SVGSynchronizableAnimatedProperty<SVGLength> m_textLength;
|
| - SVGLength m_specifiedTextLength;
|
| -
|
| + RefPtr<SVGAnimatedLength> m_textLength;
|
| + bool m_textLengthIsSpecifiedByUser;
|
| BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGTextContentElement)
|
| DECLARE_ANIMATED_ENUMERATION(LengthAdjust, lengthAdjust, SVGLengthAdjustType)
|
| END_DECLARE_ANIMATED_PROPERTIES
|
|
|