| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "ash/rotator/test/screen_rotation_animator_test_api.h" | 5 #include "ash/rotator/test/screen_rotation_animator_test_api.h" |
| 6 | 6 |
| 7 #include "ash/rotator/screen_rotation_animator.h" | 7 #include "ash/rotator/screen_rotation_animator.h" |
| 8 #include "ui/compositor/layer.h" | 8 #include "ui/compositor/layer.h" |
| 9 #include "ui/compositor/layer_tree_owner.h" | 9 #include "ui/compositor/layer_tree_owner.h" |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 animator_->set_disable_animation_timers_for_test(true); | 21 animator_->set_disable_animation_timers_for_test(true); |
| 22 } | 22 } |
| 23 | 23 |
| 24 std::vector<ui::LayerAnimator*> | 24 std::vector<ui::LayerAnimator*> |
| 25 ScreenRotationAnimatorTestApi::GetLayerAnimators() { | 25 ScreenRotationAnimatorTestApi::GetLayerAnimators() { |
| 26 std::vector<ui::LayerAnimator*> animators; | 26 std::vector<ui::LayerAnimator*> animators; |
| 27 if (animator_->old_layer_tree_owner_) { | 27 if (animator_->old_layer_tree_owner_) { |
| 28 animators.insert(animators.end(), | 28 animators.insert(animators.end(), |
| 29 animator_->old_layer_tree_owner_->root()->GetAnimator()); | 29 animator_->old_layer_tree_owner_->root()->GetAnimator()); |
| 30 } | 30 } |
| 31 if (animator_->new_layer_tree_owner_) { |
| 32 animators.insert(animators.end(), |
| 33 animator_->new_layer_tree_owner_->root()->GetAnimator()); |
| 34 } |
| 31 return animators; | 35 return animators; |
| 32 } | 36 } |
| 33 | 37 |
| 34 } // namespace test | 38 } // namespace test |
| 35 } // namespace ash | 39 } // namespace ash |
| OLD | NEW |