| Index: Source/core/animation/Animation.h
|
| diff --git a/Source/core/animation/Animation.h b/Source/core/animation/Animation.h
|
| index f360e3c9a57909c5249bf91080146c5a504681ce..aed79ca32944494f0b574a1cd7adedcc00445280 100644
|
| --- a/Source/core/animation/Animation.h
|
| +++ b/Source/core/animation/Animation.h
|
| @@ -66,10 +66,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.get();
|
| }
|
|
|
| bool affects(CSSPropertyID) const;
|
| @@ -106,7 +106,7 @@ private:
|
| RefPtrWillBePersistent<AnimationEffect> m_effect;
|
|
|
| bool m_activeInAnimationStack;
|
| - OwnPtr<AnimationEffect::CompositableValueList> m_compositableValues;
|
| + OwnPtr<Vector<RefPtr<Interpolation> > > m_activeInterpolations;
|
|
|
| Priority m_priority;
|
|
|
|
|