Index: cc/test/animation_test_common.h |
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h |
index 6ee0cdd87ddb4c4b90239e178af29f8ce533fa1b..6df5db2f23ae0e7b731f1cfebb4a5aa7975c3b16 100644 |
--- a/cc/test/animation_test_common.h |
+++ b/cc/test/animation_test_common.h |
@@ -8,6 +8,7 @@ |
#include "cc/active_animation.h" |
#include "cc/animation_curve.h" |
#include "cc/layer_animation_controller.h" |
+#include "cc/layer_animation_value_observer.h" |
namespace cc { |
class LayerImpl; |
@@ -60,17 +61,17 @@ private: |
float m_to; |
}; |
-class FakeLayerAnimationControllerClient : public cc::LayerAnimationControllerClient { |
+class FakeLayerAnimationValueObserver : public cc::LayerAnimationValueObserver { |
public: |
- FakeLayerAnimationControllerClient(); |
- virtual ~FakeLayerAnimationControllerClient(); |
- |
- // LayerAnimationControllerClient implementation |
- virtual int id() const OVERRIDE; |
- virtual void setOpacityFromAnimation(float) OVERRIDE; |
- virtual float opacity() const OVERRIDE; |
- virtual void setTransformFromAnimation(const gfx::Transform&) OVERRIDE; |
- virtual const gfx::Transform& transform() const OVERRIDE; |
+ FakeLayerAnimationValueObserver(); |
+ virtual ~FakeLayerAnimationValueObserver(); |
+ |
+ // LayerAnimationValueObserver implementation |
+ virtual void OnOpacityAnimated(float) OVERRIDE; |
+ virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE; |
+ |
+ float opacity() const { return m_opacity; } |
+ const gfx::Transform& transform() const { return m_transform; } |
private: |
float m_opacity; |