From 415f53ef5d509c8a3ea0f472f9fd6bd175129d78 Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Fri, 21 Dec 2012 01:02:15 +0000 Subject: Revert "Rename ActiveAnimation -> Animation" TBR=vollick BUG=none Review URL: https://codereview.chromium.org/11642055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174296 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/compositor_bindings/web_layer_impl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'webkit/compositor_bindings/web_layer_impl.cc') diff --git a/webkit/compositor_bindings/web_layer_impl.cc b/webkit/compositor_bindings/web_layer_impl.cc index 8d17fda..d73796e 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/animation.h" +#include "cc/active_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::Animation; +using cc::ActiveAnimation; 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(targetProperty)); + m_layer->layerAnimationController()->removeAnimation(animationId, static_cast(targetProperty)); } void WebLayerImpl::pauseAnimation(int animationId, double timeOffset) -- cgit v1.1