Rename ActiveAnimation -> Animation

webkit/compositor_bindings/web_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web_layer_impl.h"
 
 #include "SkMatrix44.h"
 #ifdef LOG
 #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"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #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 {
 gfx::Transform convertWebTransformationMatrixToTransform(const WebKit::WebTransformationMatrix& matrix)
 {
     // TODO(jamesr): When gfx::Transform provides a constructor that does not
     // initialize the matrix, use that.
     gfx::Transform transform;
     transform.matrix().setDouble(0, 0, matrix.m11());
     transform.matrix().setDouble(0, 1, matrix.m21());
@@ skipping 250 matching lines @@
     return m_layer->addAnimation(static_cast<WebAnimationImpl*>(animation)->cloneToAnimation());
 }
 
 void WebLayerImpl::removeAnimation(int animationId)
 {
     m_layer->removeAnimation(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)
 {
     m_layer->pauseAnimation(animationId, timeOffset);
 }
 
 void WebLayerImpl::suspendAnimations(double monotonicTime)
 {
     m_layer->suspendAnimations(monotonicTime);
@@ skipping 141 matching lines @@
 {
     m_layer->setLayerScrollClient(scrollClient);
 }
 
 Layer* WebLayerImpl::layer() const
 {
     return m_layer.get();
 }
 
 } // namespace WebKit