| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ui/views/animation/test/flood_fill_ink_drop_animation_test_api.h" | 5 #include "ui/views/animation/test/flood_fill_ink_drop_animation_test_api.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 gfx::Transform FloodFillInkDropAnimationTestApi::CalculateTransform( | 24 gfx::Transform FloodFillInkDropAnimationTestApi::CalculateTransform( |
| 25 float target_radius) const { | 25 float target_radius) const { |
| 26 return ink_drop_animation()->CalculateTransform(target_radius); | 26 return ink_drop_animation()->CalculateTransform(target_radius); |
| 27 } | 27 } |
| 28 | 28 |
| 29 float FloodFillInkDropAnimationTestApi::GetCurrentOpacity() const { | 29 float FloodFillInkDropAnimationTestApi::GetCurrentOpacity() const { |
| 30 return ink_drop_animation()->root_layer_.opacity(); | 30 return ink_drop_animation()->root_layer_.opacity(); |
| 31 } | 31 } |
| 32 | 32 |
| 33 std::vector<ui::LayerAnimator*> | 33 std::vector<ui::LayerAnimator*> |
| 34 FloodFillInkDropAnimationTestApi::GetLayerAnimators() const { | 34 FloodFillInkDropAnimationTestApi::GetLayerAnimators() { |
| 35 std::vector<ui::LayerAnimator*> animators = | 35 std::vector<ui::LayerAnimator*> animators = |
| 36 InkDropAnimationTestApi::GetLayerAnimators(); | 36 InkDropAnimationTestApi::GetLayerAnimators(); |
| 37 animators.push_back(ink_drop_animation()->GetRootLayer()->GetAnimator()); | 37 animators.push_back(ink_drop_animation()->GetRootLayer()->GetAnimator()); |
| 38 animators.push_back(ink_drop_animation()->painted_layer_.GetAnimator()); | 38 animators.push_back(ink_drop_animation()->painted_layer_.GetAnimator()); |
| 39 return animators; | 39 return animators; |
| 40 } | 40 } |
| 41 | 41 |
| 42 } // namespace test | 42 } // namespace test |
| 43 } // namespace views | 43 } // namespace views |
| OLD | NEW |