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

Unified Diff: cc/trees/damage_tracker_unittest.cc

Issue 2080223010: cc: Clean up root_layer code in LTI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase++ Created 4 years, 6 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/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/damage_tracker_unittest.cc
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index fd9acf1304df008cd499ea281ca32d7ae92c75ba..49d3e11929f9382585bc2889c944eb39887abc74 100644
--- a/cc/trees/damage_tracker_unittest.cc
+++ b/cc/trees/damage_tracker_unittest.cc
@@ -98,9 +98,9 @@ class DamageTrackerTest : public testing::Test {
child->SetBounds(gfx::Size(30, 30));
child->SetDrawsContent(true);
root->test_properties()->AddChild(std::move(child));
- host_impl_.active_tree()->SetRootLayer(std::move(root));
+ host_impl_.active_tree()->SetRootLayerForTesting(std::move(root));
- return host_impl_.active_tree()->root_layer();
+ return host_impl_.active_tree()->root_layer_for_testing();
}
LayerImpl* CreateTestTreeWithTwoSurfaces() {
@@ -149,9 +149,9 @@ class DamageTrackerTest : public testing::Test {
child1->test_properties()->AddChild(std::move(grand_child2));
root->test_properties()->AddChild(std::move(child1));
root->test_properties()->AddChild(std::move(child2));
- host_impl_.active_tree()->SetRootLayer(std::move(root));
+ host_impl_.active_tree()->SetRootLayerForTesting(std::move(root));
- return host_impl_.active_tree()->root_layer();
+ return host_impl_.active_tree()->root_layer_for_testing();
}
LayerImpl* CreateAndSetUpTestTreeWithOneSurface() {
@@ -1552,8 +1552,8 @@ TEST_F(DamageTrackerTest, VerifyDamageForEmptyLayerList) {
std::unique_ptr<LayerImpl> root =
LayerImpl::Create(host_impl_.active_tree(), 1);
root->test_properties()->force_render_surface = true;
- host_impl_.active_tree()->SetRootLayer(std::move(root));
- LayerImpl* root_ptr = host_impl_.active_tree()->root_layer();
+ host_impl_.active_tree()->SetRootLayerForTesting(std::move(root));
+ LayerImpl* root_ptr = host_impl_.active_tree()->root_layer_for_testing();
root_ptr->layer_tree_impl()->property_trees()->needs_rebuild = true;
EmulateDrawingOneFrame(root_ptr);
« no previous file with comments | « cc/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698