OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/animation.h" | 5 #include "cc/animation/animation.h" |
| 6 #include "ui/compositor/layer_animation_sequence.h" |
6 #include "ui/compositor/test/layer_animator_test_controller.h" | 7 #include "ui/compositor/test/layer_animator_test_controller.h" |
7 #include "ui/compositor/layer_animation_sequence.h" | |
8 | 8 |
9 namespace ui { | 9 namespace ui { |
10 | 10 |
11 LayerAnimatorTestController::LayerAnimatorTestController( | 11 LayerAnimatorTestController::LayerAnimatorTestController( |
12 scoped_refptr<LayerAnimator> animator) | 12 scoped_refptr<LayerAnimator> animator) |
13 : animator_(animator) { | 13 : animator_(animator) { |
14 } | 14 } |
15 | 15 |
16 LayerAnimatorTestController::~LayerAnimatorTestController() { | 16 LayerAnimatorTestController::~LayerAnimatorTestController() { |
17 } | 17 } |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( | 50 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( |
51 cc::AnimationEvent::Started, | 51 cc::AnimationEvent::Started, |
52 0, | 52 0, |
53 element->animation_group_id(), | 53 element->animation_group_id(), |
54 threaded_properties[i], | 54 threaded_properties[i], |
55 (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF())); | 55 (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF())); |
56 } | 56 } |
57 } | 57 } |
58 | 58 |
59 } // namespace ui | 59 } // namespace ui |
OLD | NEW |