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

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

Issue 2084233002: cc: Move LayerImpl::AddChild and RemoveChild to LayerImplTestProperties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « cc/test/layer_tree_json_parser_unittest.cc ('k') | cc/tiles/tile_manager_perftest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/test_layer_tree_host_base.h" 5 #include "cc/test/test_layer_tree_host_base.h"
6 6
7 #include "cc/test/fake_output_surface.h" 7 #include "cc/test/fake_output_surface.h"
8 #include "cc/test/fake_raster_source.h" 8 #include "cc/test/fake_raster_source.h"
9 #include "cc/trees/layer_tree_impl.h" 9 #include "cc/trees/layer_tree_impl.h"
10 10
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 LayerImpl::Create(pending_tree, root_id_); 113 LayerImpl::Create(pending_tree, root_id_);
114 pending_layer = FakePictureLayerImpl::Create(pending_tree, id_); 114 pending_layer = FakePictureLayerImpl::Create(pending_tree, id_);
115 if (!tile_size.IsEmpty()) 115 if (!tile_size.IsEmpty())
116 pending_layer->set_fixed_tile_size(tile_size); 116 pending_layer->set_fixed_tile_size(tile_size);
117 pending_layer->SetDrawsContent(true); 117 pending_layer->SetDrawsContent(true);
118 pending_layer->SetScrollClipLayer(new_pending_root->id()); 118 pending_layer->SetScrollClipLayer(new_pending_root->id());
119 pending_root = new_pending_root.get(); 119 pending_root = new_pending_root.get();
120 pending_tree->SetRootLayer(std::move(new_pending_root)); 120 pending_tree->SetRootLayer(std::move(new_pending_root));
121 } else { 121 } else {
122 pending_layer.reset(static_cast<FakePictureLayerImpl*>( 122 pending_layer.reset(static_cast<FakePictureLayerImpl*>(
123 pending_root 123 pending_root->test_properties()
124 ->RemoveChildForTesting( 124 ->RemoveChild(pending_root->test_properties()->children[0])
125 pending_root->test_properties()->children[0])
126 .release())); 125 .release()));
127 if (!tile_size.IsEmpty()) 126 if (!tile_size.IsEmpty())
128 pending_layer->set_fixed_tile_size(tile_size); 127 pending_layer->set_fixed_tile_size(tile_size);
129 } 128 }
130 pending_root->test_properties()->force_render_surface = true; 129 pending_root->test_properties()->force_render_surface = true;
131 // The bounds() just mirror the raster source size. 130 // The bounds() just mirror the raster source size.
132 pending_layer->SetBounds(raster_source->GetSize()); 131 pending_layer->SetBounds(raster_source->GetSize());
133 pending_layer->SetRasterSourceOnPending(raster_source, invalidation); 132 pending_layer->SetRasterSourceOnPending(raster_source, invalidation);
134 133
135 pending_root->AddChild(std::move(pending_layer)); 134 pending_root->test_properties()->AddChild(std::move(pending_layer));
136 pending_tree->SetViewportLayersFromIds(Layer::INVALID_ID, 135 pending_tree->SetViewportLayersFromIds(Layer::INVALID_ID,
137 pending_tree->root_layer()->id(), 136 pending_tree->root_layer()->id(),
138 Layer::INVALID_ID, Layer::INVALID_ID); 137 Layer::INVALID_ID, Layer::INVALID_ID);
139 138
140 pending_layer_ = static_cast<FakePictureLayerImpl*>( 139 pending_layer_ = static_cast<FakePictureLayerImpl*>(
141 host_impl()->pending_tree()->LayerById(id_)); 140 host_impl()->pending_tree()->LayerById(id_));
142 141
143 // Add tilings/tiles for the layer. 142 // Add tilings/tiles for the layer.
144 bool update_lcd_text = false; 143 bool update_lcd_text = false;
145 RebuildPropertyTreesOnPendingTree(); 144 RebuildPropertyTreesOnPendingTree();
(...skipping 27 matching lines...) Expand all
173 state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2; 172 state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2;
174 state.memory_limit_policy = ALLOW_ANYTHING; 173 state.memory_limit_policy = ALLOW_ANYTHING;
175 state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES; 174 state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES;
176 175
177 host_impl_->resource_pool()->SetResourceUsageLimits( 176 host_impl_->resource_pool()->SetResourceUsageLimits(
178 state.soft_memory_limit_in_bytes, state.num_resources_limit); 177 state.soft_memory_limit_in_bytes, state.num_resources_limit);
179 host_impl_->tile_manager()->SetGlobalStateForTesting(state); 178 host_impl_->tile_manager()->SetGlobalStateForTesting(state);
180 } 179 }
181 180
182 } // namespace cc 181 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_json_parser_unittest.cc ('k') | cc/tiles/tile_manager_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698