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

Side by Side Diff: cc/trees/layer_tree_host_unittest_occlusion.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, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/layers/picture_layer.h" 8 #include "cc/layers/picture_layer.h"
9 #include "cc/test/fake_content_layer_client.h" 9 #include "cc/test/fake_content_layer_client.h"
10 #include "cc/test/layer_tree_test.h" 10 #include "cc/test/layer_tree_test.h"
(...skipping 30 matching lines...) Expand all
41 child_->SetIsDrawable(true); 41 child_->SetIsDrawable(true);
42 root->AddChild(child_); 42 root->AddChild(child_);
43 43
44 layer_tree_host()->SetRootLayer(root); 44 layer_tree_host()->SetRootLayer(root);
45 LayerTreeTest::SetupTree(); 45 LayerTreeTest::SetupTree();
46 } 46 }
47 47
48 void BeginTest() override { PostSetNeedsCommitToMainThread(); } 48 void BeginTest() override { PostSetNeedsCommitToMainThread(); }
49 49
50 void DrawLayersOnThread(LayerTreeHostImpl* impl) override { 50 void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
51 LayerImpl* root = impl->active_tree()->root_layer(); 51 LayerImpl* root = impl->active_tree()->root_layer_for_testing();
52 LayerImpl* child = impl->active_tree()->LayerById(child_->id()); 52 LayerImpl* child = impl->active_tree()->LayerById(child_->id());
53 53
54 // Verify the draw properties are valid. 54 // Verify the draw properties are valid.
55 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member()); 55 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
56 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member()); 56 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
57 57
58 EXPECT_OCCLUSION_EQ( 58 EXPECT_OCCLUSION_EQ(
59 Occlusion(child->DrawTransform(), SimpleEnclosedRegion(), 59 Occlusion(child->DrawTransform(), SimpleEnclosedRegion(),
60 SimpleEnclosedRegion()), 60 SimpleEnclosedRegion()),
61 child->draw_properties().occlusion_in_content_space); 61 child->draw_properties().occlusion_in_content_space);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 child2->SetIsDrawable(true); 97 child2->SetIsDrawable(true);
98 root->AddChild(child2); 98 root->AddChild(child2);
99 99
100 layer_tree_host()->SetRootLayer(root); 100 layer_tree_host()->SetRootLayer(root);
101 LayerTreeTest::SetupTree(); 101 LayerTreeTest::SetupTree();
102 } 102 }
103 103
104 void BeginTest() override { PostSetNeedsCommitToMainThread(); } 104 void BeginTest() override { PostSetNeedsCommitToMainThread(); }
105 105
106 void DrawLayersOnThread(LayerTreeHostImpl* impl) override { 106 void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
107 LayerImpl* root = impl->active_tree()->root_layer(); 107 LayerImpl* root = impl->active_tree()->root_layer_for_testing();
108 LayerImpl* child = impl->active_tree()->LayerById(child_->id()); 108 LayerImpl* child = impl->active_tree()->LayerById(child_->id());
109 RenderSurfaceImpl* surface = child->render_surface(); 109 RenderSurfaceImpl* surface = child->render_surface();
110 110
111 // Verify the draw properties are valid. 111 // Verify the draw properties are valid.
112 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member()); 112 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
113 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member()); 113 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
114 EXPECT_TRUE(child->has_render_surface()); 114 EXPECT_TRUE(child->has_render_surface());
115 EXPECT_EQ(child->render_surface(), child->render_target()); 115 EXPECT_EQ(child->render_surface(), child->render_target());
116 116
117 EXPECT_OCCLUSION_EQ( 117 EXPECT_OCCLUSION_EQ(
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 root->AddChild(child2); 164 root->AddChild(child2);
165 165
166 layer_tree_host()->SetRootLayer(root); 166 layer_tree_host()->SetRootLayer(root);
167 LayerTreeTest::SetupTree(); 167 LayerTreeTest::SetupTree();
168 client_.set_bounds(root->bounds()); 168 client_.set_bounds(root->bounds());
169 } 169 }
170 170
171 void BeginTest() override { PostSetNeedsCommitToMainThread(); } 171 void BeginTest() override { PostSetNeedsCommitToMainThread(); }
172 172
173 void DrawLayersOnThread(LayerTreeHostImpl* impl) override { 173 void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
174 LayerImpl* root = impl->active_tree()->root_layer(); 174 LayerImpl* root = impl->active_tree()->root_layer_for_testing();
175 LayerImpl* child = impl->active_tree()->LayerById(child_->id()); 175 LayerImpl* child = impl->active_tree()->LayerById(child_->id());
176 RenderSurfaceImpl* surface = child->render_surface(); 176 RenderSurfaceImpl* surface = child->render_surface();
177 LayerImpl* mask = surface->MaskLayer(); 177 LayerImpl* mask = surface->MaskLayer();
178 178
179 // Verify the draw properties are valid. 179 // Verify the draw properties are valid.
180 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member()); 180 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
181 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member()); 181 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
182 EXPECT_TRUE(child->has_render_surface()); 182 EXPECT_TRUE(child->has_render_surface());
183 EXPECT_EQ(child->render_surface(), child->render_target()); 183 EXPECT_EQ(child->render_surface(), child->render_target());
184 184
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 root->AddChild(child2); 305 root->AddChild(child2);
306 306
307 layer_tree_host()->SetRootLayer(root); 307 layer_tree_host()->SetRootLayer(root);
308 LayerTreeTest::SetupTree(); 308 LayerTreeTest::SetupTree();
309 client_.set_bounds(root->bounds()); 309 client_.set_bounds(root->bounds());
310 } 310 }
311 311
312 void BeginTest() override { PostSetNeedsCommitToMainThread(); } 312 void BeginTest() override { PostSetNeedsCommitToMainThread(); }
313 313
314 void DrawLayersOnThread(LayerTreeHostImpl* impl) override { 314 void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
315 LayerImpl* root = impl->active_tree()->root_layer(); 315 LayerImpl* root = impl->active_tree()->root_layer_for_testing();
316 LayerImpl* child = impl->active_tree()->LayerById(child_->id()); 316 LayerImpl* child = impl->active_tree()->LayerById(child_->id());
317 RenderSurfaceImpl* surface = child->render_surface(); 317 RenderSurfaceImpl* surface = child->render_surface();
318 LayerImpl* mask = surface->MaskLayer(); 318 LayerImpl* mask = surface->MaskLayer();
319 319
320 // Verify the draw properties are valid. 320 // Verify the draw properties are valid.
321 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member()); 321 EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
322 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member()); 322 EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
323 EXPECT_TRUE(child->has_render_surface()); 323 EXPECT_TRUE(child->has_render_surface());
324 EXPECT_EQ(child->render_surface(), child->render_target()); 324 EXPECT_EQ(child->render_surface(), child->render_target());
325 325
(...skipping 16 matching lines...) Expand all
342 private: 342 private:
343 FakeContentLayerClient client_; 343 FakeContentLayerClient client_;
344 scoped_refptr<Layer> child_; 344 scoped_refptr<Layer> child_;
345 }; 345 };
346 346
347 SINGLE_AND_MULTI_THREAD_TEST_F( 347 SINGLE_AND_MULTI_THREAD_TEST_F(
348 LayerTreeHostOcclusionTestDrawPropertiesInsideReplica); 348 LayerTreeHostOcclusionTestDrawPropertiesInsideReplica);
349 349
350 } // namespace 350 } // namespace
351 } // namespace cc 351 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_damage.cc ('k') | cc/trees/layer_tree_host_unittest_picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698