1 files changed, 6 insertions, 6 deletions

diff --git a/cc/layer_animation_controller.h b/cc/layer_animation_controller.h
index 2169442..aeb5048 100644
--- a/cc/layer_animation_controller.h
+++ b/cc/layer_animation_controller.h
@@ -37,10 +37,10 @@ public:
     int id() const { return m_id; }
 
     // These methods are virtual for testing.
-    virtual void addAnimation(scoped_ptr<Animation>);
+    virtual void addAnimation(scoped_ptr<ActiveAnimation>);
     virtual void pauseAnimation(int animationId, double timeOffset);
     virtual void removeAnimation(int animationId);
-    virtual void removeAnimation(int animationId, Animation::TargetProperty);
+    virtual void removeAnimation(int animationId, ActiveAnimation::TargetProperty);
     virtual void suspendAnimations(double monotonicTime);
     virtual void resumeAnimations(double monotonicTime);
 
@@ -52,11 +52,11 @@ public:
 
     // Returns the active animation in the given group, animating the given property, if such an
     // animation exists.
-    Animation* getAnimation(int groupId, Animation::TargetProperty) const;
+    ActiveAnimation* getActiveAnimation(int groupId, ActiveAnimation::TargetProperty) const;
 
     // Returns the active animation animating the given property that is either running, or is
     // next to run, if such an animation exists.
-    Animation* getAnimation(Animation::TargetProperty) const;
+    ActiveAnimation* getActiveAnimation(ActiveAnimation::TargetProperty) const;
 
     // Returns true if there are any animations that have neither finished nor aborted.
     bool hasActiveAnimation() const;
@@ -66,7 +66,7 @@ public:
 
     // Returns true if there is an animation currently animating the given property, or
     // if there is an animation scheduled to animate this property in the future.
-    bool isAnimatingProperty(Animation::TargetProperty) const;
+    bool isAnimatingProperty(ActiveAnimation::TargetProperty) const;
 
     // This is called in response to an animation being started on the impl thread. This
     // function updates the corresponding main thread animation's start time.
@@ -114,7 +114,7 @@ private:
 
     AnimationRegistrar* m_registrar;
     int m_id;
-    ScopedPtrVector<Animation> m_activeAnimations;
+    ScopedPtrVector<ActiveAnimation> m_activeAnimations;
 
     // This is used to ensure that we don't spam the registrar.
     bool m_isActive;