| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "cc/animation/animation.h" | 7 #include "cc/animation/animation.h" |
| 8 #include "cc/animation/animation_events.h" |
| 8 #include "ui/compositor/layer_animation_sequence.h" | 9 #include "ui/compositor/layer_animation_sequence.h" |
| 9 #include "ui/compositor/test/layer_animator_test_controller.h" | 10 #include "ui/compositor/test/layer_animator_test_controller.h" |
| 10 #include "ui/gfx/geometry/rect.h" | 11 #include "ui/gfx/geometry/rect.h" |
| 11 | 12 |
| 12 namespace ui { | 13 namespace ui { |
| 13 | 14 |
| 14 LayerAnimatorTestController::LayerAnimatorTestController( | 15 LayerAnimatorTestController::LayerAnimatorTestController( |
| 15 scoped_refptr<LayerAnimator> animator) | 16 scoped_refptr<LayerAnimator> animator) |
| 16 : animator_(animator) { | 17 : animator_(animator) { |
| 17 } | 18 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 element->effective_start_time() != base::TimeTicks()) | 50 element->effective_start_time() != base::TimeTicks()) |
| 50 continue; | 51 continue; |
| 51 | 52 |
| 52 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( | 53 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( |
| 53 cc::AnimationEvent::STARTED, 0, element->animation_group_id(), | 54 cc::AnimationEvent::STARTED, 0, element->animation_group_id(), |
| 54 threaded_properties[i], base::TimeTicks::Now())); | 55 threaded_properties[i], base::TimeTicks::Now())); |
| 55 } | 56 } |
| 56 } | 57 } |
| 57 | 58 |
| 58 } // namespace ui | 59 } // namespace ui |
| OLD | NEW |