| 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/fake_image_serialization_processor.h" | 8 #include "cc/test/fake_image_serialization_processor.h" |
| 9 #include "cc/test/test_task_graph_runner.h" | 9 #include "cc/test/test_task_graph_runner.h" |
| 10 | 10 |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { | 85 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { |
| 86 scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree(); | 86 scoped_ptr<LayerImpl> old_root_layer_impl = active_tree()->DetachLayerTree(); |
| 87 | 87 |
| 88 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( | 88 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( |
| 89 root_layer(), std::move(old_root_layer_impl), active_tree()); | 89 root_layer(), std::move(old_root_layer_impl), active_tree()); |
| 90 active_tree()->SetPropertyTrees(*property_trees()); | 90 active_tree()->SetPropertyTrees(*property_trees()); |
| 91 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); | 91 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); |
| 92 | 92 |
| 93 active_tree()->SetRootLayer(std::move(layer_impl)); | 93 active_tree()->SetRootLayer(std::move(layer_impl)); |
| 94 active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |
| 94 | 95 |
| 95 if (page_scale_layer() && inner_viewport_scroll_layer()) { | 96 if (page_scale_layer() && inner_viewport_scroll_layer()) { |
| 96 active_tree()->SetViewportLayersFromIds( | 97 active_tree()->SetViewportLayersFromIds( |
| 97 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() | 98 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() |
| 98 : Layer::INVALID_ID, | 99 : Layer::INVALID_ID, |
| 99 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), | 100 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), |
| 100 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() | 101 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() |
| 101 : Layer::INVALID_ID); | 102 : Layer::INVALID_ID); |
| 102 } | 103 } |
| 103 | 104 |
| 104 active_tree()->UpdatePropertyTreesForBoundsDelta(); | 105 active_tree()->UpdatePropertyTreesForBoundsDelta(); |
| 105 return active_tree()->root_layer(); | 106 return active_tree()->root_layer(); |
| 106 } | 107 } |
| 107 | 108 |
| 108 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { | 109 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { |
| 109 scoped_ptr<LayerImpl> old_root_layer_impl = pending_tree()->DetachLayerTree(); | 110 scoped_ptr<LayerImpl> old_root_layer_impl = pending_tree()->DetachLayerTree(); |
| 110 | 111 |
| 111 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( | 112 scoped_ptr<LayerImpl> layer_impl = TreeSynchronizer::SynchronizeTrees( |
| 112 root_layer(), std::move(old_root_layer_impl), pending_tree()); | 113 root_layer(), std::move(old_root_layer_impl), pending_tree()); |
| 113 pending_tree()->SetPropertyTrees(*property_trees()); | 114 pending_tree()->SetPropertyTrees(*property_trees()); |
| 114 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); | 115 TreeSynchronizer::PushProperties(root_layer(), layer_impl.get()); |
| 115 | 116 |
| 116 pending_tree()->SetRootLayer(std::move(layer_impl)); | 117 pending_tree()->SetRootLayer(std::move(layer_impl)); |
| 118 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |
| 117 return pending_tree()->root_layer(); | 119 return pending_tree()->root_layer(); |
| 118 } | 120 } |
| 119 | 121 |
| 120 } // namespace cc | 122 } // namespace cc |
| OLD | NEW |