diff options
Diffstat (limited to 'cc/test/animation_test_common.cc')
| -rw-r--r-- | cc/test/animation_test_common.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 8f0dfe2..258a266 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -10,7 +10,7 @@ #include "cc/layer_impl.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformOperations.h" -using cc::Animation; +using cc::ActiveAnimation; using cc::AnimationCurve; using cc::EaseTimingFunction; using cc::FloatKeyframe; @@ -37,7 +37,7 @@ int addOpacityTransition(Target& target, double duration, float startOpacity, fl int id = nextAnimationId++; - scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), id, 0, Animation::Opacity)); + scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<AnimationCurve>(), id, 0, ActiveAnimation::Opacity)); animation->setNeedsSynchronizedStartTime(true); target.addAnimation(animation.Pass()); @@ -61,7 +61,7 @@ int addAnimatedTransform(Target& target, double duration, int deltaX, int deltaY int id = nextAnimationId++; - scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), id, 0, Animation::Transform)); + scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<AnimationCurve>(), id, 0, ActiveAnimation::Transform)); animation->setNeedsSynchronizedStartTime(true); target.addAnimation(animation.Pass()); |