| 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 #include "cc/test/animation_test_common.h" | 5 #include "cc/test/animation_test_common.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation_id_provider.h" | 7 #include "cc/animation/animation_id_provider.h" |
| 8 #include "cc/animation/keyframed_animation_curve.h" | 8 #include "cc/animation/keyframed_animation_curve.h" |
| 9 #include "cc/animation/layer_animation_controller.h" | 9 #include "cc/animation/layer_animation_controller.h" |
| 10 #include "cc/animation/transform_operations.h" | 10 #include "cc/animation/transform_operations.h" |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 int AddAnimatedTransformToLayer(LayerImpl* layer, | 310 int AddAnimatedTransformToLayer(LayerImpl* layer, |
| 311 double duration, | 311 double duration, |
| 312 int delta_x, | 312 int delta_x, |
| 313 int delta_y) { | 313 int delta_y) { |
| 314 return AddAnimatedTransform(layer->layer_animation_controller(), | 314 return AddAnimatedTransform(layer->layer_animation_controller(), |
| 315 duration, | 315 duration, |
| 316 delta_x, | 316 delta_x, |
| 317 delta_y); | 317 delta_y); |
| 318 } | 318 } |
| 319 | 319 |
| 320 int AddAnimatedTransformToLayer(Layer* layer, |
| 321 double duration, |
| 322 TransformOperations start_operations, |
| 323 TransformOperations operations) { |
| 324 return AddAnimatedTransform(layer, duration, start_operations, operations); |
| 325 } |
| 326 |
| 320 int AddAnimatedTransformToLayer(LayerImpl* layer, | 327 int AddAnimatedTransformToLayer(LayerImpl* layer, |
| 321 double duration, | 328 double duration, |
| 322 TransformOperations start_operations, | 329 TransformOperations start_operations, |
| 323 TransformOperations operations) { | 330 TransformOperations operations) { |
| 324 return AddAnimatedTransform(layer->layer_animation_controller(), | 331 return AddAnimatedTransform(layer->layer_animation_controller(), |
| 325 duration, | 332 duration, |
| 326 start_operations, | 333 start_operations, |
| 327 operations); | 334 operations); |
| 328 } | 335 } |
| 329 | 336 |
| 330 int AddAnimatedFilterToLayer(Layer* layer, | 337 int AddAnimatedFilterToLayer(Layer* layer, |
| 331 double duration, | 338 double duration, |
| 332 float start_brightness, | 339 float start_brightness, |
| 333 float end_brightness) { | 340 float end_brightness) { |
| 334 return AddAnimatedFilter(layer, duration, start_brightness, end_brightness); | 341 return AddAnimatedFilter(layer, duration, start_brightness, end_brightness); |
| 335 } | 342 } |
| 336 | 343 |
| 337 int AddAnimatedFilterToLayer(LayerImpl* layer, | 344 int AddAnimatedFilterToLayer(LayerImpl* layer, |
| 338 double duration, | 345 double duration, |
| 339 float start_brightness, | 346 float start_brightness, |
| 340 float end_brightness) { | 347 float end_brightness) { |
| 341 return AddAnimatedFilter(layer->layer_animation_controller(), | 348 return AddAnimatedFilter(layer->layer_animation_controller(), |
| 342 duration, | 349 duration, |
| 343 start_brightness, | 350 start_brightness, |
| 344 end_brightness); | 351 end_brightness); |
| 345 } | 352 } |
| 346 | 353 |
| 347 } // namespace cc | 354 } // namespace cc |
| OLD | NEW |