diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 01:02:15 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 01:02:15 +0000 |
| commit | 415f53ef5d509c8a3ea0f472f9fd6bd175129d78 (patch) | |
| tree | c690b043e72fb535709fd0934a098a12ed880b0f /webkit/compositor_bindings/web_layer_impl.cc | |
| parent | dfad18be78e099d61120b44ebaafa236fc5f8be0 (diff) | |
| download | chromium_src-415f53ef5d509c8a3ea0f472f9fd6bd175129d78.zip chromium_src-415f53ef5d509c8a3ea0f472f9fd6bd175129d78.tar.gz chromium_src-415f53ef5d509c8a3ea0f472f9fd6bd175129d78.tar.bz2 | |
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
Diffstat (limited to 'webkit/compositor_bindings/web_layer_impl.cc')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<Animation::TargetProperty>(targetProperty)); + m_layer->layerAnimationController()->removeAnimation(animationId, static_cast<ActiveAnimation::TargetProperty>(targetProperty)); } void WebLayerImpl::pauseAnimation(int animationId, double timeOffset) |