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