Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: cc/test/fake_layer_tree_host.cc

Issue 2159513003: Setup LayerTree class, refactor 2 functions from LayerTreeHost to it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix based on review. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
80 if (renderer_capabilities_set) 80 if (renderer_capabilities_set)
81 return renderer_capabilities; 81 return renderer_capabilities;
82 return LayerTreeHost::GetRendererCapabilities(); 82 return LayerTreeHost::GetRendererCapabilities();
83 } 83 }
84 84
85 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; } 85 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; }
86 86
87 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() { 87 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
88 TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree()); 88 TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree());
89 active_tree()->SetPropertyTrees(property_trees()); 89 active_tree()->SetPropertyTrees(property_trees());
90 TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(), 90 TreeSynchronizer::PushLayerProperties(
91 active_tree()); 91 root_layer()->layer_tree_host()->GetLayerTree(), active_tree());
92 animation_host()->PushPropertiesTo(host_impl_.animation_host()); 92 animation_host()->PushPropertiesTo(host_impl_.animation_host());
93 93
94 active_tree()->UpdatePropertyTreeScrollOffset(property_trees()); 94 active_tree()->UpdatePropertyTreeScrollOffset(property_trees());
95 95
96 if (page_scale_layer() && inner_viewport_scroll_layer()) { 96 if (page_scale_layer() && inner_viewport_scroll_layer()) {
97 active_tree()->SetViewportLayersFromIds( 97 active_tree()->SetViewportLayersFromIds(
98 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id() 98 overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id()
99 : Layer::INVALID_ID, 99 : Layer::INVALID_ID,
100 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(), 100 page_scale_layer()->id(), inner_viewport_scroll_layer()->id(),
101 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id() 101 outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id()
102 : Layer::INVALID_ID); 102 : Layer::INVALID_ID);
103 } 103 }
104 104
105 active_tree()->UpdatePropertyTreesForBoundsDelta(); 105 active_tree()->UpdatePropertyTreesForBoundsDelta();
106 return active_tree()->root_layer_for_testing(); 106 return active_tree()->root_layer_for_testing();
107 } 107 }
108 108
109 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() { 109 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() {
110 TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree()); 110 TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree());
111 pending_tree()->SetPropertyTrees(property_trees()); 111 pending_tree()->SetPropertyTrees(property_trees());
112 TreeSynchronizer::PushLayerProperties(root_layer()->layer_tree_host(), 112 TreeSynchronizer::PushLayerProperties(
113 pending_tree()); 113 root_layer()->layer_tree_host()->GetLayerTree(), pending_tree());
114 animation_host()->PushPropertiesTo(host_impl_.animation_host()); 114 animation_host()->PushPropertiesTo(host_impl_.animation_host());
115 115
116 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees()); 116 pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());
117 return pending_tree()->root_layer_for_testing(); 117 return pending_tree()->root_layer_for_testing();
118 } 118 }
119 119
120 } // namespace cc 120 } // namespace cc
OLDNEW
« no previous file with comments | « cc/proto/layer_tree_host.proto ('k') | cc/trees/layer_tree.h » ('j') | cc/trees/layer_tree.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698