| Index: Source/core/animation/Animation.h
|
| diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h
|
| index abc1be35e82ba28cab42075d6a46bb3f3c48596c..a8f62001d6b7b06cfeffe94e2020c2bfebab3acb 100644
|
| --- a/Source/core/animation/Animation.h
|
| +++ b/Source/core/animation/Animation.h
|
| @@ -71,10 +71,10 @@ public:
|
|
|
| virtual bool isAnimation() const OVERRIDE { return true; }
|
|
|
| - const AnimationEffect::CompositableValueList* compositableValues() const
|
| + const Vector<RefPtr<Interpolation> >& activeInterpolations() const
|
| {
|
| - ASSERT(m_compositableValues);
|
| - return m_compositableValues.get();
|
| + ASSERT(m_activeInterpolations);
|
| + return *m_activeInterpolations;
|
| }
|
|
|
| bool affects(CSSPropertyID) const;
|
| @@ -107,7 +107,7 @@ private:
|
| RefPtrWillBePersistent<AnimationEffect> m_effect;
|
|
|
| bool m_activeInAnimationStack;
|
| - OwnPtr<AnimationEffect::CompositableValueList> m_compositableValues;
|
| + OwnPtr<Vector<RefPtr<Interpolation> > > m_activeInterpolations;
|
|
|
| Priority m_priority;
|
|
|
|
|