From c2a4176b6099eb93c2198778442e54ad1d1ac78e Mon Sep 17 00:00:00 2001 From: vollick Date: Tue, 1 Mar 2016 06:47:38 -0800 Subject: Use LTHI's *_list() accessors whenever possible This is a mechanical patch which replaces instances of LTHI->[active|pending|recycle|_tree()->list() with LTHI->[active|pending|recycle|_list() BUG=557194 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1748813003 Cr-Commit-Position: refs/heads/master@{#378429} --- .../scrollbar_animation_controller_linear_fade_unittest.cc | 12 ++++++------ cc/input/scrollbar_animation_controller_thinning_unittest.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'cc/input') diff --git a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc index 20cf0b8..2f9e3bb 100644 --- a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc @@ -131,7 +131,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, } TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnResize) { - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds()); @@ -162,7 +162,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnResize) { } TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest, HideOnResize) { - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds()); @@ -195,7 +195,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, HideOnUserNonScrollableHorz) { EXPECT_EQ(HORIZONTAL, scrollbar_layer_->orientation()); - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); scroll_layer->set_user_scrollable_horizontal(false); @@ -211,7 +211,7 @@ TEST_F(ScrollbarAnimationControllerLinearFadeTest, ShowOnUserNonScrollableVert) { EXPECT_EQ(HORIZONTAL, scrollbar_layer_->orientation()); - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); scroll_layer->set_user_scrollable_vertical(false); @@ -227,7 +227,7 @@ TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest, HideOnUserNonScrollableVert) { EXPECT_EQ(VERTICAL, scrollbar_layer_->orientation()); - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); scroll_layer->set_user_scrollable_vertical(false); @@ -243,7 +243,7 @@ TEST_F(VerticalScrollbarAnimationControllerLinearFadeTest, ShowOnUserNonScrollableHorz) { EXPECT_EQ(VERTICAL, scrollbar_layer_->orientation()); - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); scroll_layer->set_user_scrollable_horizontal(false); diff --git a/cc/input/scrollbar_animation_controller_thinning_unittest.cc b/cc/input/scrollbar_animation_controller_thinning_unittest.cc index 12b2d84..6ecb733 100644 --- a/cc/input/scrollbar_animation_controller_thinning_unittest.cc +++ b/cc/input/scrollbar_animation_controller_thinning_unittest.cc @@ -90,7 +90,7 @@ TEST_F(ScrollbarAnimationControllerThinningTest, Idle) { // Check that scrollbar disappears when the layer becomes non-scrollable. TEST_F(ScrollbarAnimationControllerThinningTest, HideOnResize) { - LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_list()->LayerById(1); ASSERT_TRUE(scroll_layer); EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds()); -- cgit v1.1