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

Unified Diff: cc/trees/occlusion_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/trees/layer_tree_impl_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/occlusion_tracker_unittest.cc
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index bbb496b03867621fd1bbbca0c6d2656b08f7d587..766df2da1743604e315c5435d482e085e386c88c 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -105,7 +105,7 @@ class OcclusionTrackerTest : public testing::Test {
TestContentLayerImpl* layer_ptr = layer.get();
SetProperties(layer_ptr, transform, position, bounds);
- host_->host_impl()->active_tree()->SetRootLayer(std::move(layer));
+ host_->host_impl()->active_tree()->SetRootLayerForTesting(std::move(layer));
layer_ptr->test_properties()->force_render_surface = true;
SetRootLayerOnMainThread(layer_ptr);
@@ -198,7 +198,7 @@ class OcclusionTrackerTest : public testing::Test {
}
void DestroyLayers() {
- host_->host_impl()->active_tree()->SetRootLayer(nullptr);
+ host_->host_impl()->active_tree()->SetRootLayerForTesting(nullptr);
render_surface_layer_list_impl_.clear();
replica_layers_.clear();
mask_layers_.clear();
@@ -221,7 +221,8 @@ class OcclusionTrackerTest : public testing::Test {
}
void CalcDrawEtc(TestContentLayerImpl* root) {
- DCHECK(root == root->layer_tree_impl()->root_layer());
+ root->layer_tree_impl()->BuildLayerListForTesting();
+ DCHECK(root == root->layer_tree_impl()->root_layer_for_testing());
// These occlusion tests attach and detach layers in multiple
// iterations, so rebuild property trees every time.
« no previous file with comments | « cc/trees/layer_tree_impl_unittest.cc ('k') | cc/trees/tree_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698