| 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/tree_synchronizer.h" | 5 #include "cc/trees/tree_synchronizer.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), | 247 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), |
| 248 host_->active_tree()); | 248 host_->active_tree()); |
| 249 LayerImpl* layer_impl_tree_root = host_->active_tree()->root_layer(); | 249 LayerImpl* layer_impl_tree_root = host_->active_tree()->root_layer(); |
| 250 ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root, | 250 ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root, |
| 251 host_->active_tree()); | 251 host_->active_tree()); |
| 252 | 252 |
| 253 // We have to push properties to pick up the destruction list pointer. | 253 // We have to push properties to pick up the destruction list pointer. |
| 254 TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(), | 254 TreeSynchronizer::PushLayerProperties(layer_tree_root->layer_tree_host(), |
| 255 host_->active_tree()); | 255 host_->active_tree()); |
| 256 | 256 |
| 257 host_->active_tree()->ResetAllChangeTracking( | 257 host_->active_tree()->ResetAllChangeTracking(); |
| 258 PropertyTrees::ResetFlags::ALL_TREES); | |
| 259 | 258 |
| 260 // re-insert the layer and sync again. | 259 // re-insert the layer and sync again. |
| 261 child2->RemoveFromParent(); | 260 child2->RemoveFromParent(); |
| 262 layer_tree_root->AddChild(child2); | 261 layer_tree_root->AddChild(child2); |
| 263 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), | 262 TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(), |
| 264 host_->active_tree()); | 263 host_->active_tree()); |
| 265 layer_impl_tree_root = host_->active_tree()->root_layer(); | 264 layer_impl_tree_root = host_->active_tree()->root_layer(); |
| 266 ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root, | 265 ExpectTreesAreIdentical(layer_tree_root.get(), layer_impl_tree_root, |
| 267 host_->active_tree()); | 266 host_->active_tree()); |
| 268 | 267 |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 633 scroll_offset_map[scroll_layer->id()]->PullDeltaForMainThread(); | 632 scroll_offset_map[scroll_layer->id()]->PullDeltaForMainThread(); |
| 634 scroll_offset_map[scroll_layer->id()]->SetCurrent(gfx::ScrollOffset(40, 50)); | 633 scroll_offset_map[scroll_layer->id()]->SetCurrent(gfx::ScrollOffset(40, 50)); |
| 635 scroll_offset_map[scroll_layer->id()]->PushFromMainThread( | 634 scroll_offset_map[scroll_layer->id()]->PushFromMainThread( |
| 636 gfx::ScrollOffset(100, 100)); | 635 gfx::ScrollOffset(100, 100)); |
| 637 scroll_offset_map[scroll_layer->id()]->PushPendingToActive(); | 636 scroll_offset_map[scroll_layer->id()]->PushPendingToActive(); |
| 638 EXPECT_TRUE(is_equal(scroll_offset_map, scroll_tree.scroll_offset_map())); | 637 EXPECT_TRUE(is_equal(scroll_offset_map, scroll_tree.scroll_offset_map())); |
| 639 } | 638 } |
| 640 | 639 |
| 641 } // namespace | 640 } // namespace |
| 642 } // namespace cc | 641 } // namespace cc |
| OLD | NEW |