summaryrefslogtreecommitdiffstats
path: root/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
diff options
context:
space:
mode:
authorvollick <vollick@chromium.org>2016-02-29 21:00:43 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-01 05:01:47 +0000
commit299bf1f63b8253c77530b904874f3435f9bde6d3 (patch)
tree093621b8fc836d3aa87357b06b1976ec83569360 /cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
parent84e53c857ee87964ca99b52cc892a407b56e2dca (diff)
downloadchromium_src-299bf1f63b8253c77530b904874f3435f9bde6d3.zip
chromium_src-299bf1f63b8253c77530b904874f3435f9bde6d3.tar.gz
chromium_src-299bf1f63b8253c77530b904874f3435f9bde6d3.tar.bz2
Introduce LayerListImpl
In this cl, the LayerTreeImpl constructs a LayerListImpl. The idea being that most plumbing won't need to change at first to get the list to where it needs to be. The first consumer of the LayerTreeImpl that I'm attempting to teach to speak LayerListImpl-ese is the LayerImpl. That has not been completely finished in this cl so that it doesn't become too big and difficult to review. NB: since the actual storage of the LayerImpls doesn't change in this cl (they're still in the LayerTreeImpl), there's no need to guard this work behind a flag. BUG=557194 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1746603002 Cr-Commit-Position: refs/heads/master@{#378398}
Diffstat (limited to 'cc/input/scrollbar_animation_controller_linear_fade_unittest.cc')
-rw-r--r--cc/input/scrollbar_animation_controller_linear_fade_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/input/scrollbar_animation_controller_linear_fade_unittest.cc
index 35eacb5..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_tree()->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_tree()->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_tree()->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_tree()->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_tree()->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_tree()->LayerById(1);
+ LayerImpl* scroll_layer = host_impl_.active_tree()->list()->LayerById(1);
ASSERT_TRUE(scroll_layer);
scroll_layer->set_user_scrollable_horizontal(false);