OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CC_TEST_ANIMATION_TEST_COMMON_H_ | 5 #ifndef CC_TEST_ANIMATION_TEST_COMMON_H_ |
6 #define CC_TEST_ANIMATION_TEST_COMMON_H_ | 6 #define CC_TEST_ANIMATION_TEST_COMMON_H_ |
7 | 7 |
8 #include "cc/active_animation.h" | 8 #include "cc/active_animation.h" |
9 #include "cc/animation_curve.h" | 9 #include "cc/animation_curve.h" |
10 #include "cc/layer_animation_controller.h" | 10 #include "cc/layer_animation_controller.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 }; | 62 }; |
63 | 63 |
64 class FakeLayerAnimationValueObserver : public cc::LayerAnimationValueObserver { | 64 class FakeLayerAnimationValueObserver : public cc::LayerAnimationValueObserver { |
65 public: | 65 public: |
66 FakeLayerAnimationValueObserver(); | 66 FakeLayerAnimationValueObserver(); |
67 virtual ~FakeLayerAnimationValueObserver(); | 67 virtual ~FakeLayerAnimationValueObserver(); |
68 | 68 |
69 // LayerAnimationValueObserver implementation | 69 // LayerAnimationValueObserver implementation |
70 virtual void OnOpacityAnimated(float) OVERRIDE; | 70 virtual void OnOpacityAnimated(float) OVERRIDE; |
71 virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE; | 71 virtual void OnTransformAnimated(const gfx::Transform&) OVERRIDE; |
| 72 virtual bool IsActive() const OVERRIDE; |
72 | 73 |
73 float opacity() const { return m_opacity; } | 74 float opacity() const { return m_opacity; } |
74 const gfx::Transform& transform() const { return m_transform; } | 75 const gfx::Transform& transform() const { return m_transform; } |
75 | 76 |
76 private: | 77 private: |
77 float m_opacity; | 78 float m_opacity; |
78 gfx::Transform m_transform; | 79 gfx::Transform m_transform; |
79 }; | 80 }; |
80 | 81 |
81 int addOpacityTransitionToController(cc::LayerAnimationController&, double durat
ion, float startOpacity, float endOpacity, bool useTimingFunction); | 82 int addOpacityTransitionToController(cc::LayerAnimationController&, double durat
ion, float startOpacity, float endOpacity, bool useTimingFunction); |
82 int addAnimatedTransformToController(cc::LayerAnimationController&, double durat
ion, int deltaX, int deltaY); | 83 int addAnimatedTransformToController(cc::LayerAnimationController&, double durat
ion, int deltaX, int deltaY); |
83 | 84 |
84 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity,
float endOpacity, bool useTimingFunction); | 85 int addOpacityTransitionToLayer(cc::Layer&, double duration, float startOpacity,
float endOpacity, bool useTimingFunction); |
85 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac
ity, float endOpacity, bool useTimingFunction); | 86 int addOpacityTransitionToLayer(cc::LayerImpl&, double duration, float startOpac
ity, float endOpacity, bool useTimingFunction); |
86 | 87 |
87 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del
taY); | 88 int addAnimatedTransformToLayer(cc::Layer&, double duration, int deltaX, int del
taY); |
88 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int
deltaY); | 89 int addAnimatedTransformToLayer(cc::LayerImpl&, double duration, int deltaX, int
deltaY); |
89 | 90 |
90 } // namespace cc | 91 } // namespace cc |
91 | 92 |
92 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ | 93 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ |
OLD | NEW |