OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/test/fake_layer_tree_host.h" | 5 #include "cc/test/fake_layer_tree_host.h" |
6 | 6 |
7 #include "cc/layers/layer.h" | 7 #include "cc/layers/layer.h" |
8 #include "cc/test/test_task_graph_runner.h" | 8 #include "cc/test/test_task_graph_runner.h" |
9 | 9 |
10 namespace cc { | 10 namespace cc { |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 } | 67 } |
68 | 68 |
69 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } | 69 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } |
70 | 70 |
71 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { | 71 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { |
72 scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree(); | 72 scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree(); |
73 | 73 |
74 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( | 74 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( |
75 root_layer(), std::move(old_root_layer_impl), active_tree()); | 75 root_layer(), std::move(old_root_layer_impl), active_tree()); |
76 active_tree()->SetPropertyTrees(*property_trees()); | 76 active_tree()->SetPropertyTrees(*property_trees()); |
77 active_tree()->property_trees()->SetupInternalPointers(); | |
sunxd
2016/02/09 00:11:32
This is to make the active_tree()->property_trees(
| |
77 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); | 78 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); |
78 | 79 |
79 active_tree()->SetRootLayer(std::move(layer_impl)); | 80 active_tree()->SetRootLayer(std::move(layer_impl)); |
80 | 81 |
81 if (page_scale_layer() && inner_viewport_scroll_layer()) { | 82 if (page_scale_layer() && inner_viewport_scroll_layer()) { |
82 active_tree()->SetViewportLayersFromIds( | 83 active_tree()->SetViewportLayersFromIds( |
83 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() | 84 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() |
84 : Layer::INVALID_ID, | 85 : Layer::INVALID_ID, |
85 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), | 86 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), |
86 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() | 87 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() |
87 : Layer::INVALID_ID); | 88 : Layer::INVALID_ID); |
88 } | 89 } |
89 | 90 |
90 active_tree()->UpdatePropertyTreesForBoundsDelta(); | 91 active_tree()->UpdatePropertyTreesForBoundsDelta(); |
91 return active_tree()->root_layer(); | 92 return active_tree()->root_layer(); |
92 } | 93 } |
93 | 94 |
94 } // namespace cc | 95 } // namespace cc |
OLD | NEW |