diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 23:07:42 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 23:07:42 +0000 |
| commit | 29738640f7606551b16abc19cf309d4c03de4c35 (patch) | |
| tree | 42499ffe4d679f86f2d45d864b914568fddb6cc2 /cc/test/animation_test_common.cc | |
| parent | a81d67fa282c79bb0354043dbdc51ae49e492bed (diff) | |
| download | chromium_src-29738640f7606551b16abc19cf309d4c03de4c35.zip chromium_src-29738640f7606551b16abc19cf309d4c03de4c35.tar.gz chromium_src-29738640f7606551b16abc19cf309d4c03de4c35.tar.bz2 | |
Rename ActiveAnimation -> Animation
ActiveAnimation has a bad name. It used to be the case that 'active' animations were a subset of all animations, but now every animation in cc/ is 'active' and I think that's confusing.
R=enne@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11636051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174267 0039d316-1c4b-4281-b951-d872f2087c98
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 258a266..8f0dfe2 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::ActiveAnimation; +using cc::Animation; 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<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<AnimationCurve>(), id, 0, ActiveAnimation::Opacity)); + scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), id, 0, Animation::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<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<AnimationCurve>(), id, 0, ActiveAnimation::Transform)); + scoped_ptr<Animation> animation(Animation::create(curve.PassAs<AnimationCurve>(), id, 0, Animation::Transform)); animation->setNeedsSynchronizedStartTime(true); target.addAnimation(animation.Pass()); |