| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/square_ink_drop_animation_test_api.h" | 5 #include "ui/views/animation/test/square_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 21 matching lines...) Expand all Loading... |
| 32 InkDropTransforms* transforms_out) const { | 32 InkDropTransforms* transforms_out) const { |
| 33 ink_drop_animation()->CalculateRectTransforms(size, corner_radius, | 33 ink_drop_animation()->CalculateRectTransforms(size, corner_radius, |
| 34 transforms_out); | 34 transforms_out); |
| 35 } | 35 } |
| 36 | 36 |
| 37 float SquareInkDropAnimationTestApi::GetCurrentOpacity() const { | 37 float SquareInkDropAnimationTestApi::GetCurrentOpacity() const { |
| 38 return ink_drop_animation()->GetCurrentOpacity(); | 38 return ink_drop_animation()->GetCurrentOpacity(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 std::vector<ui::LayerAnimator*> | 41 std::vector<ui::LayerAnimator*> |
| 42 SquareInkDropAnimationTestApi::GetLayerAnimators() const { | 42 SquareInkDropAnimationTestApi::GetLayerAnimators() { |
| 43 std::vector<ui::LayerAnimator*> animators = | 43 std::vector<ui::LayerAnimator*> animators = |
| 44 InkDropAnimationTestApi::GetLayerAnimators(); | 44 InkDropAnimationTestApi::GetLayerAnimators(); |
| 45 animators.push_back(ink_drop_animation()->GetRootLayer()->GetAnimator()); | 45 animators.push_back(ink_drop_animation()->GetRootLayer()->GetAnimator()); |
| 46 for (int i = 0; i < SquareInkDropAnimation::PAINTED_SHAPE_COUNT; ++i) | 46 for (int i = 0; i < SquareInkDropAnimation::PAINTED_SHAPE_COUNT; ++i) |
| 47 animators.push_back( | 47 animators.push_back( |
| 48 ink_drop_animation()->painted_layers_[i]->GetAnimator()); | 48 ink_drop_animation()->painted_layers_[i]->GetAnimator()); |
| 49 return animators; | 49 return animators; |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace test | 52 } // namespace test |
| 53 } // namespace views | 53 } // namespace views |
| OLD | NEW |