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 "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "base/threading/thread_task_runner_handle.h" | 8 #include "base/threading/thread_task_runner_handle.h" |
9 #include "cc/animation/animation_host.h" | 9 #include "cc/animation/animation_host.h" |
10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 | 101 |
102 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } | 102 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } |
103 | 103 |
104 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { | 104 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { |
105 TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree()); | 105 TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree()); |
106 active_tree()->SetPropertyTrees(property_trees()); | 106 active_tree()->SetPropertyTrees(property_trees()); |
107 TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(), | 107 TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(), |
108 active_tree()); | 108 active_tree()); |
109 layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host()); | 109 layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host()); |
110 | 110 |
111 active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); | 111 active_tree()->property_trees()->scroll_tree.PushScrollUpdatesFromMainThread( |
| 112 property_trees(), active_tree()); |
112 | 113 |
113 if (layer_tree_->page_scale_layer() && | 114 if (layer_tree_->page_scale_layer() && |
114 layer_tree_->inner_viewport_scroll_layer()) { | 115 layer_tree_->inner_viewport_scroll_layer()) { |
115 active_tree()->SetViewportLayersFromIds( | 116 active_tree()->SetViewportLayersFromIds( |
116 layer_tree_->overscroll_elasticity_layer() | 117 layer_tree_->overscroll_elasticity_layer() |
117 ? layer_tree_->overscroll_elasticity_layer()->id() | 118 ? layer_tree_->overscroll_elasticity_layer()->id() |
118 : Layer::INVALID_ID, | 119 : Layer::INVALID_ID, |
119 layer_tree_->page_scale_layer()->id(), | 120 layer_tree_->page_scale_layer()->id(), |
120 layer_tree_->inner_viewport_scroll_layer()->id(), | 121 layer_tree_->inner_viewport_scroll_layer()->id(), |
121 layer_tree_->outer_viewport_scroll_layer() | 122 layer_tree_->outer_viewport_scroll_layer() |
122 ? layer_tree_->outer_viewport_scroll_layer()->id() | 123 ? layer_tree_->outer_viewport_scroll_layer()->id() |
123 : Layer::INVALID_ID); | 124 : Layer::INVALID_ID); |
124 } | 125 } |
125 | 126 |
126 active_tree()->UpdatePropertyTreesForBoundsDelta(); | 127 active_tree()->UpdatePropertyTreesForBoundsDelta(); |
127 return active_tree()->root_layer_for_testing(); | 128 return active_tree()->root_layer_for_testing(); |
128 } | 129 } |
129 | 130 |
130 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { | 131 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { |
131 TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree()); | 132 TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree()); |
132 pending_tree()->SetPropertyTrees(property_trees()); | 133 pending_tree()->SetPropertyTrees(property_trees()); |
133 TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(), | 134 TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(), |
134 pending_tree()); | 135 pending_tree()); |
135 layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host()); | 136 layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host()); |
136 | 137 |
137 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); | 138 pending_tree()->property_trees()->scroll_tree.PushScrollUpdatesFromMainThread( |
| 139 property_trees(), pending_tree()); |
138 return pending_tree()->root_layer_for_testing(); | 140 return pending_tree()->root_layer_for_testing(); |
139 } | 141 } |
140 | 142 |
141 } // namespace cc | 143 } // namespace cc |
OLD | NEW |