| Index: cc/test/animation_test_common.cc
|
| diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
|
| index 62b0de8b4eec7f481e7458b7a87a4ecf3b970064..184a585d695f38333a965ca64efb55266b44372f 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()
|
| +FakeLayerAnimationControllerObserver::FakeLayerAnimationControllerObserver()
|
| : m_opacity(0)
|
| {
|
| }
|
|
|
| -FakeLayerAnimationControllerClient::~FakeLayerAnimationControllerClient()
|
| +FakeLayerAnimationControllerObserver::~FakeLayerAnimationControllerObserver()
|
| {
|
| }
|
|
|
| -int FakeLayerAnimationControllerClient::id() const
|
| -{
|
| - return 0;
|
| -}
|
| -
|
| -void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity)
|
| +void FakeLayerAnimationControllerObserver::OnOpacityAnimated(float opacity)
|
| {
|
| m_opacity = opacity;
|
| }
|
|
|
| -float FakeLayerAnimationControllerClient::opacity() const
|
| -{
|
| - return m_opacity;
|
| -}
|
| -
|
| -void FakeLayerAnimationControllerClient::setTransformFromAnimation(const gfx::Transform& transform)
|
| +void FakeLayerAnimationControllerObserver::OnTransformAnimated(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>();
|
|
|