diff options
author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 07:37:08 +0000 |
---|---|---|
committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 07:37:08 +0000 |
commit | 0a9fd4dd4f05423a83479ace4d2b2469eced588e (patch) | |
tree | bf8de741db7e373a398bde755180b926b608c51d /cc/test/animation_test_common.cc | |
parent | 3d871d9695ec44bf3b5cabd09549bd2c1f999eb5 (diff) | |
download | chromium_src-0a9fd4dd4f05423a83479ace4d2b2469eced588e.zip chromium_src-0a9fd4dd4f05423a83479ace4d2b2469eced588e.tar.gz chromium_src-0a9fd4dd4f05423a83479ace4d2b2469eced588e.tar.bz2 |
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.
BUG=162111
Review URL: https://chromiumcodereview.appspot.com/11348256
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/animation_test_common.cc')
-rw-r--r-- | cc/test/animation_test_common.cc | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index fd6ba2d..73e0960 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -150,40 +150,6 @@ float FakeFloatTransition::getValue(double time) const return (1 - time) * m_from + time * m_to; } -FakeLayerAnimationControllerClient::FakeLayerAnimationControllerClient() - : m_opacity(0) -{ -} - -FakeLayerAnimationControllerClient::~FakeLayerAnimationControllerClient() -{ -} - -int FakeLayerAnimationControllerClient::id() const -{ - return 0; -} - -void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity) -{ - m_opacity = opacity; -} - -float FakeLayerAnimationControllerClient::opacity() const -{ - return m_opacity; -} - -void FakeLayerAnimationControllerClient::setTransformFromAnimation(const gfx::Transform& transform) -{ - m_transform = transform; -} - -const gfx::Transform& FakeLayerAnimationControllerClient::transform() const -{ - return m_transform; -} - scoped_ptr<cc::AnimationCurve> FakeFloatTransition::clone() const { return make_scoped_ptr(new FakeFloatTransition(*this)).PassAs<cc::AnimationCurve>(); |