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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 | 157 |
158 void FakeLayerAnimationValueObserver::OnTransformAnimated( | 158 void FakeLayerAnimationValueObserver::OnTransformAnimated( |
159 const gfx::Transform& transform) { | 159 const gfx::Transform& transform) { |
160 transform_ = transform; | 160 transform_ = transform; |
161 } | 161 } |
162 | 162 |
163 bool FakeLayerAnimationValueObserver::IsActive() const { | 163 bool FakeLayerAnimationValueObserver::IsActive() const { |
164 return true; | 164 return true; |
165 } | 165 } |
166 | 166 |
| 167 bool FakeInactiveLayerAnimationValueObserver::IsActive() const { |
| 168 return false; |
| 169 } |
| 170 |
167 scoped_ptr<cc::AnimationCurve> FakeFloatTransition::Clone() const { | 171 scoped_ptr<cc::AnimationCurve> FakeFloatTransition::Clone() const { |
168 return make_scoped_ptr( | 172 return make_scoped_ptr( |
169 new FakeFloatTransition(*this)).PassAs<cc::AnimationCurve>(); | 173 new FakeFloatTransition(*this)).PassAs<cc::AnimationCurve>(); |
170 } | 174 } |
171 | 175 |
172 int AddOpacityTransitionToController(cc::LayerAnimationController* controller, | 176 int AddOpacityTransitionToController(cc::LayerAnimationController* controller, |
173 double duration, | 177 double duration, |
174 float start_opacity, | 178 float start_opacity, |
175 float end_opacity, | 179 float end_opacity, |
176 bool use_timing_function) { | 180 bool use_timing_function) { |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 double duration, | 230 double duration, |
227 int delta_x, | 231 int delta_x, |
228 int delta_y) { | 232 int delta_y) { |
229 return AddAnimatedTransform(layer->layer_animation_controller(), | 233 return AddAnimatedTransform(layer->layer_animation_controller(), |
230 duration, | 234 duration, |
231 delta_x, | 235 delta_x, |
232 delta_y); | 236 delta_y); |
233 } | 237 } |
234 | 238 |
235 } // namespace cc | 239 } // namespace cc |
OLD | NEW |