| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<A
nimationCurve>(), id, 0, ActiveAnimation::Transform)); | 64 scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<A
nimationCurve>(), id, 0, ActiveAnimation::Transform)); |
| 65 animation->setNeedsSynchronizedStartTime(true); | 65 animation->setNeedsSynchronizedStartTime(true); |
| 66 | 66 |
| 67 target.addAnimation(animation.Pass()); | 67 target.addAnimation(animation.Pass()); |
| 68 return id; | 68 return id; |
| 69 } | 69 } |
| 70 | 70 |
| 71 } // namespace | 71 } // namespace |
| 72 | 72 |
| 73 namespace WebKitTests { | 73 namespace cc { |
| 74 | 74 |
| 75 FakeFloatAnimationCurve::FakeFloatAnimationCurve() | 75 FakeFloatAnimationCurve::FakeFloatAnimationCurve() |
| 76 : m_duration(1) | 76 : m_duration(1) |
| 77 { | 77 { |
| 78 } | 78 } |
| 79 | 79 |
| 80 FakeFloatAnimationCurve::FakeFloatAnimationCurve(double duration) | 80 FakeFloatAnimationCurve::FakeFloatAnimationCurve(double duration) |
| 81 : m_duration(duration) | 81 : m_duration(duration) |
| 82 { | 82 { |
| 83 } | 83 } |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 int addAnimatedTransformToLayer(cc::Layer& layer, double duration, int deltaX, i
nt deltaY) | 178 int addAnimatedTransformToLayer(cc::Layer& layer, double duration, int deltaX, i
nt deltaY) |
| 179 { | 179 { |
| 180 return addAnimatedTransform(layer, duration, deltaX, deltaY); | 180 return addAnimatedTransform(layer, duration, deltaX, deltaY); |
| 181 } | 181 } |
| 182 | 182 |
| 183 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta
X, int deltaY) | 183 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta
X, int deltaY) |
| 184 { | 184 { |
| 185 return addAnimatedTransform(*layer.layerAnimationController(), duration, del
taX, deltaY); | 185 return addAnimatedTransform(*layer.layerAnimationController(), duration, del
taX, deltaY); |
| 186 } | 186 } |
| 187 | 187 |
| 188 } // namespace WebKitTests | 188 } // namespace cc |
| OLD | NEW |