From de4afb5eaff3e756cc13d915532402c651302a32 Mon Sep 17 00:00:00 2001 From: "vollick@chromium.org" Date: Thu, 20 Dec 2012 00:11:34 +0000 Subject: Ref count layer animation controllers. With this patch we accomplish the following: 1. layer animation controllers are ref counted (so they can be shared by the two impl trees) 2. the layer tree hosts now own a list of active animation controllers. This allows for a couple of nice things __a. Ticking the animation controllers no longer requires a tree walk __b. We will be able to support ticking of animation controllers for layers that are not yet added to the layer tree. (Support coming in a future patch). 3. animation controllers register and unregister themselves from their respective layer tree host's list when they have an animation to tick. R=nduca@chromium.org,enne@chromium.org BUG=162111 Review URL: https://chromiumcodereview.appspot.com/11598005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174043 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/animation_test_common.cc | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'cc/test/animation_test_common.cc') diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 9920751..258a266 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -146,40 +146,25 @@ float FakeFloatTransition::getValue(double time) const return (1 - time) * m_from + time * m_to; } -FakeLayerAnimationControllerClient::FakeLayerAnimationControllerClient() +FakeLayerAnimationValueObserver::FakeLayerAnimationValueObserver() : m_opacity(0) { } -FakeLayerAnimationControllerClient::~FakeLayerAnimationControllerClient() +FakeLayerAnimationValueObserver::~FakeLayerAnimationValueObserver() { } -int FakeLayerAnimationControllerClient::id() const -{ - return 0; -} - -void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity) +void FakeLayerAnimationValueObserver::OnOpacityAnimated(float opacity) { m_opacity = opacity; } -float FakeLayerAnimationControllerClient::opacity() const -{ - return m_opacity; -} - -void FakeLayerAnimationControllerClient::setTransformFromAnimation(const gfx::Transform& transform) +void FakeLayerAnimationValueObserver::OnTransformAnimated(const gfx::Transform& transform) { m_transform = transform; } -const gfx::Transform& FakeLayerAnimationControllerClient::transform() const -{ - return m_transform; -} - scoped_ptr FakeFloatTransition::clone() const { return make_scoped_ptr(new FakeFloatTransition(*this)).PassAs(); -- cgit v1.1