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/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/animation/animation_curve.h" | 9 #include "cc/animation/animation_curve.h" |
10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 virtual bool IsActive() const OVERRIDE; | 72 virtual bool IsActive() const OVERRIDE; |
73 | 73 |
74 float opacity() const { return opacity_; } | 74 float opacity() const { return opacity_; } |
75 const gfx::Transform& transform() const { return transform_; } | 75 const gfx::Transform& transform() const { return transform_; } |
76 | 76 |
77 private: | 77 private: |
78 float opacity_; | 78 float opacity_; |
79 gfx::Transform transform_; | 79 gfx::Transform transform_; |
80 }; | 80 }; |
81 | 81 |
| 82 class FakeInactiveLayerAnimationValueObserver |
| 83 : public FakeLayerAnimationValueObserver { |
| 84 public: |
| 85 virtual bool IsActive() const OVERRIDE; |
| 86 }; |
| 87 |
82 int AddOpacityTransitionToController(LayerAnimationController* controller, | 88 int AddOpacityTransitionToController(LayerAnimationController* controller, |
83 double duration, | 89 double duration, |
84 float start_opacity, | 90 float start_opacity, |
85 float end_opacity, | 91 float end_opacity, |
86 bool use_timing_function); | 92 bool use_timing_function); |
87 | 93 |
88 int AddAnimatedTransformToController(LayerAnimationController* controller, | 94 int AddAnimatedTransformToController(LayerAnimationController* controller, |
89 double duration, | 95 double duration, |
90 int delta_x, | 96 int delta_x, |
91 int delta_y); | 97 int delta_y); |
(...skipping 16 matching lines...) Expand all Loading... |
108 int delta_y); | 114 int delta_y); |
109 | 115 |
110 int AddAnimatedTransformToLayer(LayerImpl* layer, | 116 int AddAnimatedTransformToLayer(LayerImpl* layer, |
111 double duration, | 117 double duration, |
112 int delta_x, | 118 int delta_x, |
113 int delta_y); | 119 int delta_y); |
114 | 120 |
115 } // namespace cc | 121 } // namespace cc |
116 | 122 |
117 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ | 123 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ |
OLD | NEW |