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

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 2331983002: cc: Make LayerTreeHost a protected Layer member. (Closed)
Patch Set: settings Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/painted_scrollbar_layer_unittest.cc ('k') | cc/layers/ui_resource_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index c174acde3f819c42af201df9fff8ee5520e85d34..9686cfae5f38d9e64199810f78a20ae50d36de2b 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -781,7 +781,8 @@ class ScrollbarLayerTestResourceCreationAndRelease : public ScrollbarLayerTest {
scrollbar_layer->set_visible_layer_rect(gfx::Rect(0, 0, 100, 200));
testing::Mock::VerifyAndClearExpectations(layer_tree_host_.get());
- EXPECT_EQ(scrollbar_layer->layer_tree_host(), layer_tree_host_.get());
+ EXPECT_EQ(scrollbar_layer->GetLayerTreeHostForTesting(),
+ layer_tree_host_.get());
scrollbar_layer->SavePaintProperties();
for (int update_counter = 0; update_counter < num_updates; update_counter++)
@@ -839,7 +840,8 @@ TEST_F(ScrollbarLayerTestResourceCreationAndRelease, TestResourceUpdate) {
scrollbar_layer->set_visible_layer_rect(gfx::Rect(0, 0, 100, 200));
testing::Mock::VerifyAndClearExpectations(layer_tree_host_.get());
- EXPECT_EQ(scrollbar_layer->layer_tree_host(), layer_tree_host_.get());
+ EXPECT_EQ(scrollbar_layer->GetLayerTreeHostForTesting(),
+ layer_tree_host_.get());
size_t resource_count;
int expected_created, expected_deleted;
@@ -998,7 +1000,8 @@ class ScaledScrollbarLayerTestResourceCreation : public ScrollbarLayerTest {
scrollbar_layer->set_visible_layer_rect(
gfx::Rect(scrollbar_location, scrollbar_layer->bounds()));
- EXPECT_EQ(scrollbar_layer->layer_tree_host(), layer_tree_host_.get());
+ EXPECT_EQ(scrollbar_layer->GetLayerTreeHostForTesting(),
+ layer_tree_host_.get());
layer_tree_->SetDeviceScaleFactor(test_scale);
« no previous file with comments | « cc/layers/painted_scrollbar_layer_unittest.cc ('k') | cc/layers/ui_resource_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698