diff options
author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 13:59:25 +0000 |
---|---|---|
committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 13:59:25 +0000 |
commit | f77f759fc8687f48a7951d36644ffa0ecb6e3ddc (patch) | |
tree | 3b4bf5d9704934b38464147cba56cf47e6e524f3 /cc | |
parent | 84d652db6d513061bc616539e2053d65c233ce04 (diff) | |
download | chromium_src-f77f759fc8687f48a7951d36644ffa0ecb6e3ddc.zip chromium_src-f77f759fc8687f48a7951d36644ffa0ecb6e3ddc.tar.gz chromium_src-f77f759fc8687f48a7951d36644ffa0ecb6e3ddc.tar.bz2 |
Remove superfluous WebLayerImpl::resumeAnimations()
This is no longer required, as WebLayer::resumeAnimations() was removed in
https://codereview.chromium.org/27589003,
BUG=248938, 243353, 62138, 61739
R=dstockwell
Review URL: https://codereview.chromium.org/31473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r-- | cc/animation/layer_animation_controller.cc | 11 | ||||
-rw-r--r-- | cc/animation/layer_animation_controller.h | 1 | ||||
-rw-r--r-- | cc/animation/layer_animation_controller_unittest.cc | 12 | ||||
-rw-r--r-- | cc/layers/layer.cc | 5 | ||||
-rw-r--r-- | cc/layers/layer.h | 1 |
5 files changed, 1 insertions, 29 deletions
diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc index 995a3931..daebc44 100644 --- a/cc/animation/layer_animation_controller.cc +++ b/cc/animation/layer_animation_controller.cc @@ -92,7 +92,7 @@ void LayerAnimationController::RemoveAnimation( UpdateActivation(NormalActivation); } -// According to render layer backing, these are for testing only. +// For testing only. void LayerAnimationController::SuspendAnimations(double monotonic_time) { for (size_t i = 0; i < active_animations_.size(); ++i) { if (!active_animations_[i]->is_finished()) @@ -100,15 +100,6 @@ void LayerAnimationController::SuspendAnimations(double monotonic_time) { } } -// Looking at GraphicsLayerCA, this appears to be the analog to -// SuspendAnimations, which is for testing. -void LayerAnimationController::ResumeAnimations(double monotonic_time) { - for (size_t i = 0; i < active_animations_.size(); ++i) { - if (active_animations_[i]->run_state() == Animation::Paused) - active_animations_[i]->SetRunState(Animation::Running, monotonic_time); - } -} - // Ensures that the list of active animations on the main thread and the impl // thread are kept in sync. void LayerAnimationController::PushAnimationUpdatesTo( diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h index e397794..4861e25 100644 --- a/cc/animation/layer_animation_controller.h +++ b/cc/animation/layer_animation_controller.h @@ -45,7 +45,6 @@ class CC_EXPORT LayerAnimationController virtual void RemoveAnimation(int animation_id, Animation::TargetProperty target_property); virtual void SuspendAnimations(double monotonic_time); - virtual void ResumeAnimations(double monotonic_time); // Ensures that the list of active animations on the main thread and the impl // thread are kept in sync. This function does not take ownership of the impl diff --git a/cc/animation/layer_animation_controller_unittest.cc b/cc/animation/layer_animation_controller_unittest.cc index 0a88bfd..32252f1 100644 --- a/cc/animation/layer_animation_controller_unittest.cc +++ b/cc/animation/layer_animation_controller_unittest.cc @@ -138,18 +138,6 @@ TEST(LayerAnimationControllerTest, SyncPauseAndResume) { EXPECT_EQ(Animation::Paused, controller_impl->GetAnimation(group_id, Animation::Opacity)->run_state()); - - // Resume the main-thread animation. - controller->ResumeAnimations(2.0); - EXPECT_EQ(Animation::Running, - controller->GetAnimation(group_id, - Animation::Opacity)->run_state()); - - // The pause run state change should make it to the impl thread controller. - controller->PushAnimationUpdatesTo(controller_impl.get()); - EXPECT_EQ(Animation::Running, - controller_impl->GetAnimation(group_id, - Animation::Opacity)->run_state()); } TEST(LayerAnimationControllerTest, DoNotSyncFinishedAnimation) { diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 80fad6a..5fa40dd 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -1028,11 +1028,6 @@ void Layer::SuspendAnimations(double monotonic_time) { SetNeedsCommit(); } -void Layer::ResumeAnimations(double monotonic_time) { - layer_animation_controller_->ResumeAnimations(monotonic_time); - SetNeedsCommit(); -} - void Layer::SetLayerAnimationControllerForTest( scoped_refptr<LayerAnimationController> controller) { layer_animation_controller_->RemoveValueObserver(this); diff --git a/cc/layers/layer.h b/cc/layers/layer.h index 1328b07..274e82f 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h @@ -376,7 +376,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, void RemoveAnimation(int animation_id); void SuspendAnimations(double monotonic_time); - void ResumeAnimations(double monotonic_time); bool AnimatedBoundsForBox(const gfx::BoxF& box, gfx::BoxF* bounds) { return layer_animation_controller_->AnimatedBoundsForBox(box, bounds); |