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/keyframed_animation_curve.h" | 7 #include "cc/animation/keyframed_animation_curve.h" |
| 8 #include "cc/animation/layer_animation_controller.h" |
8 #include "cc/layer.h" | 9 #include "cc/layer.h" |
9 #include "cc/layer_animation_controller.h" | |
10 #include "cc/layer_impl.h" | 10 #include "cc/layer_impl.h" |
11 #include "cc/transform_operations.h" | 11 #include "cc/transform_operations.h" |
12 | 12 |
13 using cc::Animation; | 13 using cc::Animation; |
14 using cc::AnimationCurve; | 14 using cc::AnimationCurve; |
15 using cc::EaseTimingFunction; | 15 using cc::EaseTimingFunction; |
16 using cc::FloatKeyframe; | 16 using cc::FloatKeyframe; |
17 using cc::KeyframedFloatAnimationCurve; | 17 using cc::KeyframedFloatAnimationCurve; |
18 using cc::KeyframedTransformAnimationCurve; | 18 using cc::KeyframedTransformAnimationCurve; |
19 using cc::TimingFunction; | 19 using cc::TimingFunction; |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 { | 199 { |
200 return addAnimatedTransform(layer, duration, deltaX, deltaY); | 200 return addAnimatedTransform(layer, duration, deltaX, deltaY); |
201 } | 201 } |
202 | 202 |
203 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta
X, int deltaY) | 203 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta
X, int deltaY) |
204 { | 204 { |
205 return addAnimatedTransform(*layer.layer_animation_controller(), duration, d
eltaX, deltaY); | 205 return addAnimatedTransform(*layer.layer_animation_controller(), duration, d
eltaX, deltaY); |
206 } | 206 } |
207 | 207 |
208 } // namespace cc | 208 } // namespace cc |
OLD | NEW |