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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 int AddAnimatedTransformToLayer(Layer* layer, | 149 int AddAnimatedTransformToLayer(Layer* layer, |
150 double duration, | 150 double duration, |
151 int delta_x, | 151 int delta_x, |
152 int delta_y); | 152 int delta_y); |
153 | 153 |
154 int AddAnimatedTransformToLayer(LayerImpl* layer, | 154 int AddAnimatedTransformToLayer(LayerImpl* layer, |
155 double duration, | 155 double duration, |
156 int delta_x, | 156 int delta_x, |
157 int delta_y); | 157 int delta_y); |
158 | 158 |
| 159 int AddAnimatedTransformToLayer(Layer* layer, |
| 160 double duration, |
| 161 TransformOperations start_operations, |
| 162 TransformOperations operations); |
| 163 |
159 int AddAnimatedTransformToLayer(LayerImpl* layer, | 164 int AddAnimatedTransformToLayer(LayerImpl* layer, |
160 double duration, | 165 double duration, |
161 TransformOperations start_operations, | 166 TransformOperations start_operations, |
162 TransformOperations operations); | 167 TransformOperations operations); |
163 | 168 |
164 int AddAnimatedFilterToLayer(Layer* layer, | 169 int AddAnimatedFilterToLayer(Layer* layer, |
165 double duration, | 170 double duration, |
166 float start_brightness, | 171 float start_brightness, |
167 float end_brightness); | 172 float end_brightness); |
168 | 173 |
169 int AddAnimatedFilterToLayer(LayerImpl* layer, | 174 int AddAnimatedFilterToLayer(LayerImpl* layer, |
170 double duration, | 175 double duration, |
171 float start_brightness, | 176 float start_brightness, |
172 float end_brightness); | 177 float end_brightness); |
173 | 178 |
174 } // namespace cc | 179 } // namespace cc |
175 | 180 |
176 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ | 181 #endif // CC_TEST_ANIMATION_TEST_COMMON_H_ |
OLD | NEW |