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

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

Powered by Google App Engine
This is Rietveld 408576698