| Index: 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 b33436a40c7baa72bdeb1556fc05d39fd31b6c9c..d0938f359c924b415e7da28f3f94e0db77e8cdc9 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 {
|
| @@ -289,7 +289,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)
|
|
|