| 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/keyframed_animation_curve.h" |
| 8 #include "cc/layer.h" | 8 #include "cc/layer.h" |
| 9 #include "cc/layer_animation_controller.h" | 9 #include "cc/layer_animation_controller.h" |
| 10 #include "cc/layer_impl.h" | 10 #include "cc/layer_impl.h" |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 return addAnimatedTransform(controller, duration, deltaX, deltaY); | 185 return addAnimatedTransform(controller, duration, deltaX, deltaY); |
| 186 } | 186 } |
| 187 | 187 |
| 188 int addOpacityTransitionToLayer(cc::Layer& layer, double duration, float startOp
acity, float endOpacity, bool useTimingFunction) | 188 int addOpacityTransitionToLayer(cc::Layer& layer, double duration, float startOp
acity, float endOpacity, bool useTimingFunction) |
| 189 { | 189 { |
| 190 return addOpacityTransition(layer, duration, startOpacity, endOpacity, useTi
mingFunction); | 190 return addOpacityTransition(layer, duration, startOpacity, endOpacity, useTi
mingFunction); |
| 191 } | 191 } |
| 192 | 192 |
| 193 int addOpacityTransitionToLayer(cc::LayerImpl& layer, double duration, float sta
rtOpacity, float endOpacity, bool useTimingFunction) | 193 int addOpacityTransitionToLayer(cc::LayerImpl& layer, double duration, float sta
rtOpacity, float endOpacity, bool useTimingFunction) |
| 194 { | 194 { |
| 195 return addOpacityTransition(*layer.layerAnimationController(), duration, sta
rtOpacity, endOpacity, useTimingFunction); | 195 return addOpacityTransition(*layer.layer_animation_controller(), duration, s
tartOpacity, endOpacity, useTimingFunction); |
| 196 } | 196 } |
| 197 | 197 |
| 198 int addAnimatedTransformToLayer(cc::Layer& layer, double duration, int deltaX, i
nt deltaY) | 198 int addAnimatedTransformToLayer(cc::Layer& layer, double duration, int deltaX, i
nt deltaY) |
| 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.layerAnimationController(), duration, del
taX, deltaY); | 205 return addAnimatedTransform(*layer.layer_animation_controller(), duration, d
eltaX, deltaY); |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace cc | 208 } // namespace cc |
| OLD | NEW |