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

Unified Diff: cc/layers/layer_iterator_unittest.cc

Issue 1491033002: Create RenderSurface on Effect Tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alwayspt
Patch Set: fix for crash Created 5 years 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/layer_impl_unittest.cc ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_iterator_unittest.cc
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc
index 48a8635d35c9c187c84b0bbf04c33d241cb99d30..b9b3cf3d283d943007c2b4541f867d9cf6935d74 100644
--- a/cc/layers/layer_iterator_unittest.cc
+++ b/cc/layers/layer_iterator_unittest.cc
@@ -135,7 +135,6 @@ TEST_F(LayerIteratorTest, SimpleTree) {
root_layer->AddChild(std::move(third));
root_layer->AddChild(std::move(fourth));
- root_layer->SetHasRenderSurface(true);
host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
LayerImplList render_surface_layer_list;
@@ -183,7 +182,6 @@ TEST_F(LayerIteratorTest, ComplexTree) {
root_layer->AddChild(std::move(root2));
root_layer->AddChild(std::move(root3));
- root_layer->SetHasRenderSurface(true);
host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
LayerImplList render_surface_layer_list;
@@ -226,12 +224,12 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
TestLayerImpl* root221_ptr = root221.get();
TestLayerImpl* root231_ptr = root231.get();
- root22->SetHasRenderSurface(true);
+ root22->SetForceRenderSurface(true);
+ root23->SetForceRenderSurface(true);
+ root2->SetForceRenderSurface(true);
root22->AddChild(std::move(root221));
- root23->SetHasRenderSurface(true);
root23->AddChild(std::move(root231));
root2->SetDrawsContent(false);
- root2->SetHasRenderSurface(true);
root2->AddChild(std::move(root21));
root2->AddChild(std::move(root22));
root2->AddChild(std::move(root23));
@@ -239,7 +237,6 @@ TEST_F(LayerIteratorTest, ComplexTreeMultiSurface) {
root_layer->AddChild(std::move(root2));
root_layer->AddChild(std::move(root3));
- root_layer->SetHasRenderSurface(true);
host_impl_.active_tree()->SetRootLayer(std::move(root_layer));
LayerImplList render_surface_layer_list;
« no previous file with comments | « cc/layers/layer_impl_unittest.cc ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698