Rename ActiveAnimation -> Animation

ActiveAnimation has a bad name. It used to be the case that 'active' animations were a subset of all animations, but now every animation in cc/ is 'active' and I think that's confusing.

R=enne@chromium.org
BUG=None


Review URL: https://chromiumcodereview.appspot.com/11636051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174267 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 11 deletions

diff --git a/webkit/compositor_bindings/web_animation_impl.cc b/webkit/compositor_bindings/web_animation_impl.cc
index a258aa2..32d1507 100644
--- a/webkit/compositor_bindings/web_animation_impl.cc
+++ b/webkit/compositor_bindings/web_animation_impl.cc
@@ -4,7 +4,7 @@
 
 #include "web_animation_impl.h"
 
-#include "cc/active_animation.h"
+#include "cc/animation.h"
 #include "cc/animation_curve.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h"
@@ -12,7 +12,7 @@
 #include "web_float_animation_curve_impl.h"
 #include "web_transform_animation_curve_impl.h"
 
-using cc::ActiveAnimation;
+using cc::Animation;
 using webkit::WebAnimationIdProvider;
 
 namespace WebKit {
@@ -38,7 +38,7 @@ WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
         break;
     }
     }
-    m_animation = ActiveAnimation::create(curve.Pass(), animationId, groupId, static_cast<cc::ActiveAnimation::TargetProperty>(targetProperty));
+    m_animation = Animation::create(curve.Pass(), animationId, groupId, static_cast<cc::Animation::TargetProperty>(targetProperty));
 }
 
 WebAnimationImpl::~WebAnimationImpl()
@@ -95,9 +95,9 @@ void WebAnimationImpl::setAlternatesDirection(bool alternates)
     m_animation->setAlternatesDirection(alternates);
 }
 
-scoped_ptr<cc::ActiveAnimation> WebAnimationImpl::cloneToAnimation()
+scoped_ptr<cc::Animation> WebAnimationImpl::cloneToAnimation()
 {
-    scoped_ptr<cc::ActiveAnimation> toReturn(m_animation->clone(cc::ActiveAnimation::NonControllingInstance));
+    scoped_ptr<cc::Animation> toReturn(m_animation->clone(cc::Animation::NonControllingInstance));
     toReturn->setNeedsSynchronizedStartTime(true);
     return toReturn.Pass();
 }
diff --git a/webkit/compositor_bindings/web_animation_impl.h b/webkit/compositor_bindings/web_animation_impl.h
index 905edc8..ebeca88 100644
--- a/webkit/compositor_bindings/web_animation_impl.h
+++ b/webkit/compositor_bindings/web_animation_impl.h
@@ -10,7 +10,7 @@
 #include "webkit/compositor_bindings/webkit_compositor_bindings_export.h"
 
 namespace cc {
-class ActiveAnimation;
+class Animation;
 }
 
 namespace WebKit {
@@ -33,10 +33,10 @@ public:
     virtual bool alternatesDirection() const OVERRIDE;
     virtual void setAlternatesDirection(bool) OVERRIDE;
 
-    scoped_ptr<cc::ActiveAnimation> cloneToAnimation();
+    scoped_ptr<cc::Animation> cloneToAnimation();
 
 private:
-    scoped_ptr<cc::ActiveAnimation> m_animation;
+    scoped_ptr<cc::Animation> m_animation;
 };
 
 }
diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc
index d73796e..8d17fda 100644
--- a/webkit/compositor_bindings/web_layer_impl.cc
+++ b/webkit/compositor_bindings/web_layer_impl.cc
@@ -9,7 +9,7 @@
 #undef LOG
 #endif
 #include "base/string_util.h"
-#include "cc/active_animation.h"
+#include "cc/animation.h"
 #include "cc/layer.h"
 #include "cc/region.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
@@ -18,7 +18,7 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 #include "web_animation_impl.h"
 
-using cc::ActiveAnimation;
+using cc::Animation;
 using cc::Layer;
 
 namespace WebKit {
@@ -262,7 +262,7 @@ void WebLayerImpl::removeAnimation(int animationId)
 
 void WebLayerImpl::removeAnimation(int animationId, WebAnimation::TargetProperty targetProperty)
 {
-    m_layer->layerAnimationController()->removeAnimation(animationId, static_cast<ActiveAnimation::TargetProperty>(targetProperty));
+    m_layer->layerAnimationController()->removeAnimation(animationId, static_cast<Animation::TargetProperty>(targetProperty));
 }
 
 void WebLayerImpl::pauseAnimation(int animationId, double timeOffset)