diff options
author | vollick <vollick@chromium.org> | 2016-03-01 15:37:04 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 23:38:40 +0000 |
commit | 1bd5b8399b04cae273eeb670dc07091f72ea28c4 (patch) | |
tree | fd09a6a24a6bcce232a6d4eeb52208c25d741293 /cc/input | |
parent | 964dcffcac8d9e599a5f66fd977c309bf03007d7 (diff) | |
download | chromium_src-1bd5b8399b04cae273eeb670dc07091f72ea28c4.zip chromium_src-1bd5b8399b04cae273eeb670dc07091f72ea28c4.tar.gz chromium_src-1bd5b8399b04cae273eeb670dc07091f72ea28c4.tar.bz2 |
Revert of Use LTHI's *_list() accessors whenever possible (patchset #1 id:1 of https://codereview.chromium.org/1748813003/ )
Reason for revert:
I'm going to try another, less code-churny, approach to the layer list conversion.
Original issue's description:
> 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
>
> Committed: https://crrev.com/c2a4176b6099eb93c2198778442e54ad1d1ac78e
> Cr-Commit-Position: refs/heads/master@{#378429}
TBR=tdresser@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=557194
Review URL: https://codereview.chromium.org/1759443002
Cr-Commit-Position: refs/heads/master@{#378603}
Diffstat (limited to 'cc/input')
-rw-r--r-- | cc/input/scrollbar_animation_controller_linear_fade_unittest.cc | 12 | ||||
-rw-r--r-- | cc/input/scrollbar_animation_controller_thinning_unittest.cc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc index 2f9e3bb..20cf0b8 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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->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 6ecb733..12b2d84 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_list()->LayerById(1); + LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1); ASSERT_TRUE(scroll_layer); EXPECT_EQ(gfx::Size(200, 200), scroll_layer->bounds()); |