| 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/layers/layer.h" | 5 #include "cc/layers/layer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); | 300 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); |
| 301 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetDoubleSided(false)); | 301 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetDoubleSided(false)); |
| 302 EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET( | 302 EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET( |
| 303 root->PushPropertiesTo(root_impl.get()); | 303 root->PushPropertiesTo(root_impl.get()); |
| 304 child->PushPropertiesTo(child_impl.get()); | 304 child->PushPropertiesTo(child_impl.get()); |
| 305 child2->PushPropertiesTo(child2_impl.get()); | 305 child2->PushPropertiesTo(child2_impl.get()); |
| 306 grand_child->PushPropertiesTo(grand_child_impl.get())); | 306 grand_child->PushPropertiesTo(grand_child_impl.get())); |
| 307 | 307 |
| 308 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); | 308 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); |
| 309 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetHideLayerAndSubtree(true)); | 309 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetHideLayerAndSubtree(true)); |
| 310 |
| 311 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); |
| 312 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetHideLayerAndSubtree(false)); |
| 310 EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET( | 313 EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET( |
| 311 root->PushPropertiesTo(root_impl.get()); | 314 root->PushPropertiesTo(root_impl.get()); |
| 312 child->PushPropertiesTo(child_impl.get()); | 315 child->PushPropertiesTo(child_impl.get()); |
| 313 child2->PushPropertiesTo(child2_impl.get()); | 316 child2->PushPropertiesTo(child2_impl.get()); |
| 314 grand_child->PushPropertiesTo(grand_child_impl.get())); | 317 grand_child->PushPropertiesTo(grand_child_impl.get())); |
| 315 | 318 |
| 316 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); | 319 EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1); |
| 317 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetBlendMode(arbitrary_blend_mode)); | 320 EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetBlendMode(arbitrary_blend_mode)); |
| 318 EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET( | 321 EXECUTE_AND_VERIFY_SUBTREE_CHANGES_RESET( |
| 319 root->PushPropertiesTo(root_impl.get()); | 322 root->PushPropertiesTo(root_impl.get()); |
| (...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1426 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); | 1429 EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties()); |
| 1427 | 1430 |
| 1428 test_layer->PushPropertiesTo(impl_layer.get()); | 1431 test_layer->PushPropertiesTo(impl_layer.get()); |
| 1429 | 1432 |
| 1430 EXPECT_EQ(ElementId(2, 0), impl_layer->element_id()); | 1433 EXPECT_EQ(ElementId(2, 0), impl_layer->element_id()); |
| 1431 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); | 1434 EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties()); |
| 1432 } | 1435 } |
| 1433 | 1436 |
| 1434 } // namespace | 1437 } // namespace |
| 1435 } // namespace cc | 1438 } // namespace cc |
| OLD | NEW |