Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: ui/views/animation/test/flood_fill_ink_drop_ripple_test_api.cc

Issue 2615613003: Fix double ripple on activated flood fill ripple (Closed)
Patch Set: Addressed nits Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_ripple_test_api.h" 5 #include "ui/views/animation/test/flood_fill_ink_drop_ripple_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 19 matching lines...) Expand all
30 gfx::Point FloodFillInkDropRippleTestApi::GetDrawnCenterPoint() const { 30 gfx::Point FloodFillInkDropRippleTestApi::GetDrawnCenterPoint() const {
31 return ToRoundedPoint(PointAtOffsetFromOrigin( 31 return ToRoundedPoint(PointAtOffsetFromOrigin(
32 ink_drop_ripple()->circle_layer_delegate_.GetCenteringOffset())); 32 ink_drop_ripple()->circle_layer_delegate_.GetCenteringOffset()));
33 } 33 }
34 34
35 float FloodFillInkDropRippleTestApi::MaxDistanceToCorners( 35 float FloodFillInkDropRippleTestApi::MaxDistanceToCorners(
36 const gfx::Point& point) const { 36 const gfx::Point& point) const {
37 return ink_drop_ripple()->MaxDistanceToCorners(point); 37 return ink_drop_ripple()->MaxDistanceToCorners(point);
38 } 38 }
39 39
40 gfx::Transform FloodFillInkDropRippleTestApi::GetPaintedLayerTransform() const {
41 return ink_drop_ripple()->painted_layer_.transform();
42 }
43
40 float FloodFillInkDropRippleTestApi::GetCurrentOpacity() const { 44 float FloodFillInkDropRippleTestApi::GetCurrentOpacity() const {
41 return ink_drop_ripple()->root_layer_.opacity(); 45 return ink_drop_ripple()->root_layer_.opacity();
42 } 46 }
43 47
44 std::vector<ui::LayerAnimator*> 48 std::vector<ui::LayerAnimator*>
45 FloodFillInkDropRippleTestApi::GetLayerAnimators() { 49 FloodFillInkDropRippleTestApi::GetLayerAnimators() {
46 std::vector<ui::LayerAnimator*> animators = 50 std::vector<ui::LayerAnimator*> animators =
47 InkDropRippleTestApi::GetLayerAnimators(); 51 InkDropRippleTestApi::GetLayerAnimators();
48 animators.push_back(ink_drop_ripple()->GetRootLayer()->GetAnimator()); 52 animators.push_back(ink_drop_ripple()->GetRootLayer()->GetAnimator());
49 animators.push_back(ink_drop_ripple()->painted_layer_.GetAnimator()); 53 animators.push_back(ink_drop_ripple()->painted_layer_.GetAnimator());
50 return animators; 54 return animators;
51 } 55 }
52 56
53 } // namespace test 57 } // namespace test
54 } // namespace views 58 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698