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/layer_tree_host_unittest_animation.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/layer_tree_host_unittest_animation.cc')
| -rw-r--r-- | cc/layer_tree_host_unittest_animation.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/cc/layer_tree_host_unittest_animation.cc b/cc/layer_tree_host_unittest_animation.cc index 42d7f1d..8d522ca 100644 --- a/cc/layer_tree_host_unittest_animation.cc +++ b/cc/layer_tree_host_unittest_animation.cc @@ -248,8 +248,8 @@ public: bool hasUnfinishedAnimation) OVERRIDE { LayerAnimationController* controller = m_layerTreeHost->rootLayer()->layerAnimationController(); - ActiveAnimation* animation = - controller->getActiveAnimation(0, ActiveAnimation::Opacity); + Animation* animation = + controller->getAnimation(0, Animation::Opacity); if (!animation) return; @@ -267,8 +267,8 @@ public: LayerAnimationController* controller_impl = host_impl->rootLayer()->layerAnimationController(); - ActiveAnimation* animation_impl = - controller_impl->getActiveAnimation(0, ActiveAnimation::Opacity); + Animation* animation_impl = + controller_impl->getAnimation(0, Animation::Opacity); controller->removeAnimation(animation->id()); controller_impl->removeAnimation(animation_impl->id()); @@ -298,8 +298,8 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes : virtual void notifyAnimationStarted(double time) OVERRIDE { LayerAnimationController* controller = m_layerTreeHost->rootLayer()->layerAnimationController(); - ActiveAnimation* animation = - controller->getActiveAnimation(0, ActiveAnimation::Opacity); + Animation* animation = + controller->getAnimation(0, Animation::Opacity); main_start_time_ = animation->startTime(); controller->removeAnimation(animation->id()); @@ -313,8 +313,8 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes : bool hasUnfinishedAnimation) OVERRIDE { LayerAnimationController* controller = impl_host->rootLayer()->layerAnimationController(); - ActiveAnimation* animation = - controller->getActiveAnimation(0, ActiveAnimation::Opacity); + Animation* animation = + controller->getAnimation(0, Animation::Opacity); if (!animation) return; @@ -349,8 +349,8 @@ class LayerTreeHostAnimationTestAnimationFinishedEvents : virtual void notifyAnimationFinished(double time) OVERRIDE { LayerAnimationController* controller = m_layerTreeHost->rootLayer()->layerAnimationController(); - ActiveAnimation* animation = - controller->getActiveAnimation(0, ActiveAnimation::Opacity); + Animation* animation = + controller->getAnimation(0, Animation::Opacity); controller->removeAnimation(animation->id()); endTest(); } @@ -419,9 +419,9 @@ class LayerTreeHostAnimationTestLayerAddedWithAnimation : // Any valid AnimationCurve will do here. scoped_ptr<AnimationCurve> curve(EaseTimingFunction::create()); - scoped_ptr<ActiveAnimation> animation( - ActiveAnimation::create(curve.Pass(), 1, 1, - ActiveAnimation::Opacity)); + scoped_ptr<Animation> animation( + Animation::create(curve.Pass(), 1, 1, + Animation::Opacity)); layer->layerAnimationController()->addAnimation(animation.Pass()); // We add the animation *before* attaching the layer to the tree. |