| 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" | 8 |
| 9 #include "ui/gfx/geometry/rect.h" | 9 #include "ui/gfx/geometry/rect.h" |
| 10 | 10 |
| 11 namespace ui { | 11 namespace ui { |
| 12 | 12 |
| 13 LayerAnimatorTestController::LayerAnimatorTestController( | 13 LayerAnimatorTestController::LayerAnimatorTestController( |
| 14 scoped_refptr<LayerAnimator> animator) | 14 scoped_refptr<LayerAnimator> animator) |
| 15 : animator_(animator) { | 15 : animator_(animator) { |
| 16 } | 16 } |
| 17 | 17 |
| 18 LayerAnimatorTestController::~LayerAnimatorTestController() { | 18 LayerAnimatorTestController::~LayerAnimatorTestController() { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 43 LayerAnimationElement* element = sequence->CurrentElement(); | 43 LayerAnimationElement* element = sequence->CurrentElement(); |
| 44 if (!(element->properties() & animatable_property)) | 44 if (!(element->properties() & animatable_property)) |
| 45 continue; | 45 continue; |
| 46 | 46 |
| 47 if (!element->Started() || | 47 if (!element->Started() || |
| 48 element->effective_start_time() != base::TimeTicks()) | 48 element->effective_start_time() != base::TimeTicks()) |
| 49 continue; | 49 continue; |
| 50 | 50 |
| 51 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( | 51 animator_->OnThreadedAnimationStarted(cc::AnimationEvent( |
| 52 cc::AnimationEvent::STARTED, 0, element->animation_group_id(), | 52 cc::AnimationEvent::STARTED, 0, element->animation_group_id(), |
| 53 threaded_properties[i], gfx::FrameTime::Now())); | 53 threaded_properties[i], base::TimeTicks::Now())); |
| 54 } | 54 } |
| 55 } | 55 } |
| 56 | 56 |
| 57 } // namespace ui | 57 } // namespace ui |
| OLD | NEW |