diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/svg/SVGAnimationElement.h | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/svg/SVGAnimationElement.h')
| -rw-r--r-- | Source/WebCore/svg/SVGAnimationElement.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/WebCore/svg/SVGAnimationElement.h b/Source/WebCore/svg/SVGAnimationElement.h index 919a1584c..ec5b2faa2 100644 --- a/Source/WebCore/svg/SVGAnimationElement.h +++ b/Source/WebCore/svg/SVGAnimationElement.h @@ -183,7 +183,7 @@ protected: AttributeTypeXML, AttributeTypeAuto }; - AttributeType attributeType() const; + AttributeType attributeType() const { return m_attributeType; } String toValue() const; String byValue() const; @@ -198,8 +198,15 @@ protected: AnimatedPropertyValueType m_fromPropertyValueType; AnimatedPropertyValueType m_toPropertyValueType; + virtual void targetElementWillChange(SVGElement* currentTarget, SVGElement* oldTarget) OVERRIDE; + bool hasInvalidCSSAttributeType() const { return m_hasInvalidCSSAttributeType; } + private: virtual void animationAttributeChanged() OVERRIDE; + virtual void setAttributeName(const QualifiedName&) OVERRIDE; + void setAttributeType(const AtomicString&); + + void checkInvalidCSSAttributeType(SVGElement*); virtual bool calculateToAtEndOfDurationValue(const String& toAtEndOfDurationString) = 0; virtual bool calculateFromAndToValues(const String& fromString, const String& toString) = 0; @@ -230,12 +237,14 @@ private: bool m_animationValid; + AttributeType m_attributeType; Vector<String> m_values; Vector<float> m_keyTimes; Vector<float> m_keyPoints; Vector<UnitBezier> m_keySplines; String m_lastValuesAnimationFrom; String m_lastValuesAnimationTo; + bool m_hasInvalidCSSAttributeType; }; } // namespace WebCore |