| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 | 104 |
| 105 FakeTransformTransition::~FakeTransformTransition() | 105 FakeTransformTransition::~FakeTransformTransition() |
| 106 { | 106 { |
| 107 } | 107 } |
| 108 | 108 |
| 109 double FakeTransformTransition::duration() const | 109 double FakeTransformTransition::duration() const |
| 110 { | 110 { |
| 111 return m_duration; | 111 return m_duration; |
| 112 } | 112 } |
| 113 | 113 |
| 114 WebKit::WebTransformationMatrix FakeTransformTransition::getValue(double time) c
onst | 114 gfx::Transform FakeTransformTransition::getValue(double time) const |
| 115 { | 115 { |
| 116 return WebKit::WebTransformationMatrix(); | 116 return gfx::Transform(); |
| 117 } | 117 } |
| 118 | 118 |
| 119 scoped_ptr<cc::AnimationCurve> FakeTransformTransition::clone() const | 119 scoped_ptr<cc::AnimationCurve> FakeTransformTransition::clone() const |
| 120 { | 120 { |
| 121 return make_scoped_ptr(new FakeTransformTransition(*this)).PassAs<cc::Animat
ionCurve>(); | 121 return make_scoped_ptr(new FakeTransformTransition(*this)).PassAs<cc::Animat
ionCurve>(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 | 124 |
| 125 FakeFloatTransition::FakeFloatTransition(double duration, float from, float to) | 125 FakeFloatTransition::FakeFloatTransition(double duration, float from, float to) |
| 126 : m_duration(duration) | 126 : m_duration(duration) |
| (...skipping 72 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.layerAnimationController(), duration, del
taX, deltaY); | 205 return addAnimatedTransform(*layer.layerAnimationController(), duration, del
taX, deltaY); |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace cc | 208 } // namespace cc |
| OLD | NEW |