| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 return LayerTreeHost::GetRendererCapabilities(); | 80 return LayerTreeHost::GetRendererCapabilities(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } | 83 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } |
| 84 | 84 |
| 85 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { | 85 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { |
| 86 TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree()); | 86 TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree()); |
| 87 active_tree()->SetPropertyTrees(*property_trees()); | 87 active_tree()->SetPropertyTrees(*property_trees()); |
| 88 TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(), | 88 TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(), |
| 89 active_tree()); | 89 active_tree()); |
| 90 animation_host()->PushPropertiesTo(host_impl_.animation_host()); | 90 animation_host()->PushPropertiesTo( |
| 91 host_impl_.animation_host(), |
| 92 host_impl_.CurrentBeginFrameArgs().frame_time); |
| 91 | 93 |
| 92 active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); | 94 active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |
| 93 | 95 |
| 94 if (page_scale_layer() && inner_viewport_scroll_layer()) { | 96 if (page_scale_layer() && inner_viewport_scroll_layer()) { |
| 95 active_tree()->SetViewportLayersFromIds( | 97 active_tree()->SetViewportLayersFromIds( |
| 96 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() | 98 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() |
| 97 : Layer::INVALID_ID, | 99 : Layer::INVALID_ID, |
| 98 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), | 100 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), |
| 99 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() | 101 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() |
| 100 : Layer::INVALID_ID); | 102 : Layer::INVALID_ID); |
| 101 } | 103 } |
| 102 | 104 |
| 103 active_tree()->UpdatePropertyTreesForBoundsDelta(); | 105 active_tree()->UpdatePropertyTreesForBoundsDelta(); |
| 104 return active_tree()->root_layer(); | 106 return active_tree()->root_layer(); |
| 105 } | 107 } |
| 106 | 108 |
| 107 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { | 109 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { |
| 108 TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree()); | 110 TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree()); |
| 109 pending_tree()->SetPropertyTrees(*property_trees()); | 111 pending_tree()->SetPropertyTrees(*property_trees()); |
| 110 TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(), | 112 TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(), |
| 111 pending_tree()); | 113 pending_tree()); |
| 112 animation_host()->PushPropertiesTo(host_impl_.animation_host()); | 114 animation_host()->PushPropertiesTo( |
| 115 host_impl_.animation_host(), |
| 116 host_impl_.CurrentBeginFrameArgs().frame_time); |
| 113 | 117 |
| 114 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); | 118 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); |
| 115 return pending_tree()->root_layer(); | 119 return pending_tree()->root_layer(); |
| 116 } | 120 } |
| 117 | 121 |
| 118 } // namespace cc | 122 } // namespace cc |
| OLD | NEW |