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