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

Side by Side Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 1236943002: Revert of Compute if a layer is clipped outside CalcDrawProps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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_common.h" 5 #include "cc/trees/layer_tree_host_common.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 9
10 #include "cc/animation/layer_animation_controller.h" 10 #include "cc/animation/layer_animation_controller.h"
(...skipping 7299 matching lines...) Expand 10 before | Expand all | Expand 10 after
7310 7310
7311 expected.clear(); 7311 expected.clear();
7312 expected.insert(grand_child2_raw); 7312 expected.insert(grand_child2_raw);
7313 7313
7314 actual.clear(); 7314 actual.clear();
7315 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); 7315 GatherDrawnLayers(render_surface_layer_list_impl(), &actual);
7316 EXPECT_EQ(expected, actual); 7316 EXPECT_EQ(expected, actual);
7317 7317
7318 // Add a mask layer to child. 7318 // Add a mask layer to child.
7319 child_raw->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 6).Pass()); 7319 child_raw->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 6).Pass());
7320 child_raw->layer_tree_impl()->property_trees()->needs_rebuild = true;
7321 7320
7322 ExecuteCalculateDrawProperties(grand_parent_raw); 7321 ExecuteCalculateDrawProperties(grand_parent_raw);
7323 member_id = render_surface_layer_list_count(); 7322 member_id = render_surface_layer_list_count();
7324 7323
7325 EXPECT_NE(member_id, membership_id(grand_parent_raw)); 7324 EXPECT_NE(member_id, membership_id(grand_parent_raw));
7326 EXPECT_NE(member_id, membership_id(parent_raw)); 7325 EXPECT_NE(member_id, membership_id(parent_raw));
7327 EXPECT_NE(member_id, membership_id(child_raw)); 7326 EXPECT_NE(member_id, membership_id(child_raw));
7328 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer())); 7327 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer()));
7329 EXPECT_NE(member_id, membership_id(grand_child1_raw)); 7328 EXPECT_NE(member_id, membership_id(grand_child1_raw));
7330 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); 7329 EXPECT_EQ(member_id, membership_id(grand_child2_raw));
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
7402 EXPECT_NE(member_id, membership_id(grand_child2_raw)); 7401 EXPECT_NE(member_id, membership_id(grand_child2_raw));
7403 7402
7404 expected.clear(); 7403 expected.clear();
7405 expected.insert(child_raw); 7404 expected.insert(child_raw);
7406 expected.insert(child_raw->mask_layer()); 7405 expected.insert(child_raw->mask_layer());
7407 actual.clear(); 7406 actual.clear();
7408 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); 7407 GatherDrawnLayers(render_surface_layer_list_impl(), &actual);
7409 EXPECT_EQ(expected, actual); 7408 EXPECT_EQ(expected, actual);
7410 7409
7411 child_raw->TakeMaskLayer(); 7410 child_raw->TakeMaskLayer();
7412 child_raw->layer_tree_impl()->property_trees()->needs_rebuild = true;
7413 7411
7414 // Now everyone's a member! 7412 // Now everyone's a member!
7415 grand_parent_raw->SetDrawsContent(true); 7413 grand_parent_raw->SetDrawsContent(true);
7416 parent_raw->SetDrawsContent(true); 7414 parent_raw->SetDrawsContent(true);
7417 child_raw->SetDrawsContent(true); 7415 child_raw->SetDrawsContent(true);
7418 grand_child1_raw->SetDrawsContent(true); 7416 grand_child1_raw->SetDrawsContent(true);
7419 grand_child2_raw->SetDrawsContent(true); 7417 grand_child2_raw->SetDrawsContent(true);
7420 7418
7421 ExecuteCalculateDrawProperties(grand_parent_raw); 7419 ExecuteCalculateDrawProperties(grand_parent_raw);
7422 member_id = render_surface_layer_list_count(); 7420 member_id = render_surface_layer_list_count();
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
8614 EXPECT_FALSE(root->layer_or_descendant_is_drawn()); 8612 EXPECT_FALSE(root->layer_or_descendant_is_drawn());
8615 EXPECT_FALSE(root->visited()); 8613 EXPECT_FALSE(root->visited());
8616 EXPECT_FALSE(root->sorted_for_recursion()); 8614 EXPECT_FALSE(root->sorted_for_recursion());
8617 EXPECT_FALSE(child->layer_or_descendant_is_drawn()); 8615 EXPECT_FALSE(child->layer_or_descendant_is_drawn());
8618 EXPECT_FALSE(child->visited()); 8616 EXPECT_FALSE(child->visited());
8619 EXPECT_FALSE(child->sorted_for_recursion()); 8617 EXPECT_FALSE(child->sorted_for_recursion());
8620 } 8618 }
8621 8619
8622 } // namespace 8620 } // namespace
8623 } // namespace cc 8621 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698