| Index: third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.h
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.h b/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.h
|
| index 210eedf8c48d355d138e413c30dc0802b3c604f1..1d598c380e2ef378855eb9185ad5782a1b7e2fff 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.h
|
| +++ b/third_party/WebKit/Source/core/svg/SVGAnimatedTypeAnimator.h
|
| @@ -40,8 +40,14 @@
|
| void clear();
|
| void reset(SVGElement* contextElement);
|
|
|
| - SVGPropertyBase* createAnimatedValue() const;
|
| - SVGPropertyBase* createPropertyForAnimation(const String&) const;
|
| + SVGPropertyBase* createAnimatedValue();
|
| + SVGPropertyBase* createAnimatedValueFromString(const String&);
|
| +
|
| + void calculateAnimatedValue(float percentage, unsigned repeatCount, SVGPropertyBase*, SVGPropertyBase*, SVGPropertyBase*, SVGPropertyBase*);
|
| + float calculateDistance(const String& fromString, const String& toString);
|
| +
|
| + void calculateFromAndToValues(Member<SVGPropertyBase>& from, Member<SVGPropertyBase>& to, const String& fromString, const String& toString);
|
| + void calculateFromAndByValues(Member<SVGPropertyBase>& from, Member<SVGPropertyBase>& to, const String& fromString, const String& byString);
|
|
|
| void setContextElement(SVGElement* contextElement) { m_contextElement = contextElement; }
|
| AnimatedPropertyType type() const { return m_type; }
|
| @@ -52,8 +58,8 @@
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - SVGPropertyBase* createPropertyForAttributeAnimation(const String&) const;
|
| - SVGPropertyBase* createPropertyForCSSAnimation(const String&) const;
|
| + friend class ParsePropertyFromString;
|
| + SVGPropertyBase* createPropertyForAnimation(const String&);
|
|
|
| Member<SVGAnimationElement> m_animationElement;
|
| Member<SVGElement> m_contextElement;
|
|
|