Index: cc/test/animation_test_common.h |
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h |
index c4bbe1581a1f8d55ef5b0648eaeee10bce31c85e..8cb4d9a59a01bf2c32705f5d8a486d48f584caea 100644 |
--- a/cc/test/animation_test_common.h |
+++ b/cc/test/animation_test_common.h |
@@ -17,76 +17,100 @@ class Layer; |
namespace cc { |
-class FakeFloatAnimationCurve : public cc::FloatAnimationCurve { |
-public: |
- FakeFloatAnimationCurve(); |
- explicit FakeFloatAnimationCurve(double duration); |
- virtual ~FakeFloatAnimationCurve(); |
- |
- virtual double Duration() const OVERRIDE; |
- virtual float GetValue(double now) const OVERRIDE; |
- virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE; |
- |
-private: |
- double m_duration; |
+class FakeFloatAnimationCurve : public FloatAnimationCurve { |
+ public: |
+ FakeFloatAnimationCurve(); |
+ explicit FakeFloatAnimationCurve(double duration); |
+ virtual ~FakeFloatAnimationCurve(); |
+ |
+ virtual double Duration() const OVERRIDE; |
+ virtual float GetValue(double now) const OVERRIDE; |
+ virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
+ |
+ private: |
+ double duration_; |
}; |
-class FakeTransformTransition : public cc::TransformAnimationCurve { |
-public: |
- FakeTransformTransition(double duration); |
- virtual ~FakeTransformTransition(); |
+class FakeTransformTransition : public TransformAnimationCurve { |
+ public: |
+ FakeTransformTransition(double duration); |
+ virtual ~FakeTransformTransition(); |
- virtual double Duration() const OVERRIDE; |
- virtual gfx::Transform GetValue(double time) const OVERRIDE; |
+ virtual double Duration() const OVERRIDE; |
+ virtual gfx::Transform GetValue(double time) const OVERRIDE; |
- virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE; |
+ virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
-private: |
- double m_duration; |
+ private: |
+ double duration_; |
}; |
-class FakeFloatTransition : public cc::FloatAnimationCurve { |
-public: |
- FakeFloatTransition(double duration, float from, float to); |
- virtual ~FakeFloatTransition(); |
+class FakeFloatTransition : public FloatAnimationCurve { |
+ public: |
+ FakeFloatTransition(double duration, float from, float to); |
+ virtual ~FakeFloatTransition(); |
- virtual double Duration() const OVERRIDE; |
- virtual float GetValue(double time) const OVERRIDE; |
+ virtual double Duration() const OVERRIDE; |
+ virtual float GetValue(double time) const OVERRIDE; |
- virtual scoped_ptr<cc::AnimationCurve> Clone() const OVERRIDE; |
+ virtual scoped_ptr<AnimationCurve> Clone() const OVERRIDE; |
-private: |
- double m_duration; |
- float m_from; |
- float m_to; |
+ private: |
+ double duration_; |
+ float from_; |
+ float to_; |
}; |
-class FakeLayerAnimationValueObserver : public cc::LayerAnimationValueObserver { |
-public: |
- FakeLayerAnimationValueObserver(); |
- virtual ~FakeLayerAnimationValueObserver(); |
+class FakeLayerAnimationValueObserver : public LayerAnimationValueObserver { |
+ public: |
+ FakeLayerAnimationValueObserver(); |
+ virtual ~FakeLayerAnimationValueObserver(); |
- // LayerAnimationValueObserver implementation |
- virtual void OnOpacityAnimated(float) OVERRIDE; |
- virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE; |
- virtual bool IsActive() const OVERRIDE; |
+ // LayerAnimationValueObserver implementation |
+ virtual void OnOpacityAnimated(float opacity) OVERRIDE; |
+ virtual void OnTransformAnimated(const gfx::Transform& transform) OVERRIDE; |
+ virtual bool IsActive() const OVERRIDE; |
- float opacity() const { return m_opacity; } |
- const gfx::Transform& transform() const { return m_transform; } |
+ float opacity() const { return opacity_; } |
+ const gfx::Transform& transform() const { return transform_; } |
-private: |
- float m_opacity; |
- gfx::Transform m_transform; |
+ private: |
+ float opacity_; |
+ gfx::Transform transform_; |
}; |
-int addOpacityTransitionToController(cc::LayerAnimationController&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); |
-int addAnimatedTransformToController(cc::LayerAnimationController&, double duration, int deltaX, int deltaY); |
- |
-int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); |
-int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpacity, float endOpacity, bool useTimingFunction); |
- |
-int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int deltaY); |
-int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int deltaY); |
+int AddOpacityTransitionToController(LayerAnimationController* controller, |
+ double duration, |
+ float start_opacity, |
+ float end_opacity, |
+ bool use_timing_function); |
+ |
+int AddAnimatedTransformToController(LayerAnimationController* controller, |
+ double duration, |
+ int delta_x, |
+ int delta_y); |
+ |
+int AddOpacityTransitionToLayer(Layer* layer, |
+ double duration, |
+ float start_opacity, |
+ float end_opacity, |
+ bool use_timing_function); |
+ |
+int AddOpacityTransitionToLayer(LayerImpl* layer, |
+ double duration, |
+ float start_opacity, |
+ float end_opacity, |
+ bool use_timing_function); |
+ |
+int AddAnimatedTransformToLayer(Layer* layer, |
+ double duration, |
+ int delta_x, |
+ int delta_y); |
+ |
+int AddAnimatedTransformToLayer(LayerImpl* layer, |
+ double duration, |
+ int delta_x, |
+ int delta_y); |
} // namespace cc |