| OLD | NEW |
| 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 Loading... |
| 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; |
| 7320 | 7321 |
| 7321 ExecuteCalculateDrawProperties(grand_parent_raw); | 7322 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 7322 member_id = render_surface_layer_list_count(); | 7323 member_id = render_surface_layer_list_count(); |
| 7323 | 7324 |
| 7324 EXPECT_NE(member_id, membership_id(grand_parent_raw)); | 7325 EXPECT_NE(member_id, membership_id(grand_parent_raw)); |
| 7325 EXPECT_NE(member_id, membership_id(parent_raw)); | 7326 EXPECT_NE(member_id, membership_id(parent_raw)); |
| 7326 EXPECT_NE(member_id, membership_id(child_raw)); | 7327 EXPECT_NE(member_id, membership_id(child_raw)); |
| 7327 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer())); | 7328 EXPECT_EQ(member_id, membership_id(child_raw->mask_layer())); |
| 7328 EXPECT_NE(member_id, membership_id(grand_child1_raw)); | 7329 EXPECT_NE(member_id, membership_id(grand_child1_raw)); |
| 7329 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); | 7330 EXPECT_EQ(member_id, membership_id(grand_child2_raw)); |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7401 EXPECT_NE(member_id, membership_id(grand_child2_raw)); | 7402 EXPECT_NE(member_id, membership_id(grand_child2_raw)); |
| 7402 | 7403 |
| 7403 expected.clear(); | 7404 expected.clear(); |
| 7404 expected.insert(child_raw); | 7405 expected.insert(child_raw); |
| 7405 expected.insert(child_raw->mask_layer()); | 7406 expected.insert(child_raw->mask_layer()); |
| 7406 actual.clear(); | 7407 actual.clear(); |
| 7407 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); | 7408 GatherDrawnLayers(render_surface_layer_list_impl(), &actual); |
| 7408 EXPECT_EQ(expected, actual); | 7409 EXPECT_EQ(expected, actual); |
| 7409 | 7410 |
| 7410 child_raw->TakeMaskLayer(); | 7411 child_raw->TakeMaskLayer(); |
| 7412 child_raw->layer_tree_impl()->property_trees()->needs_rebuild = true; |
| 7411 | 7413 |
| 7412 // Now everyone's a member! | 7414 // Now everyone's a member! |
| 7413 grand_parent_raw->SetDrawsContent(true); | 7415 grand_parent_raw->SetDrawsContent(true); |
| 7414 parent_raw->SetDrawsContent(true); | 7416 parent_raw->SetDrawsContent(true); |
| 7415 child_raw->SetDrawsContent(true); | 7417 child_raw->SetDrawsContent(true); |
| 7416 grand_child1_raw->SetDrawsContent(true); | 7418 grand_child1_raw->SetDrawsContent(true); |
| 7417 grand_child2_raw->SetDrawsContent(true); | 7419 grand_child2_raw->SetDrawsContent(true); |
| 7418 | 7420 |
| 7419 ExecuteCalculateDrawProperties(grand_parent_raw); | 7421 ExecuteCalculateDrawProperties(grand_parent_raw); |
| 7420 member_id = render_surface_layer_list_count(); | 7422 member_id = render_surface_layer_list_count(); |
| (...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8612 EXPECT_FALSE(root->layer_or_descendant_is_drawn()); | 8614 EXPECT_FALSE(root->layer_or_descendant_is_drawn()); |
| 8613 EXPECT_FALSE(root->visited()); | 8615 EXPECT_FALSE(root->visited()); |
| 8614 EXPECT_FALSE(root->sorted_for_recursion()); | 8616 EXPECT_FALSE(root->sorted_for_recursion()); |
| 8615 EXPECT_FALSE(child->layer_or_descendant_is_drawn()); | 8617 EXPECT_FALSE(child->layer_or_descendant_is_drawn()); |
| 8616 EXPECT_FALSE(child->visited()); | 8618 EXPECT_FALSE(child->visited()); |
| 8617 EXPECT_FALSE(child->sorted_for_recursion()); | 8619 EXPECT_FALSE(child->sorted_for_recursion()); |
| 8618 } | 8620 } |
| 8619 | 8621 |
| 8620 } // namespace | 8622 } // namespace |
| 8621 } // namespace cc | 8623 } // namespace cc |
| OLD | NEW |