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

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

Issue 2189583004: [not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Combined rebase 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 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 LayerImpl* pending_root = pending_tree->root_layer_for_testing(); 110 LayerImpl* pending_root = pending_tree->root_layer_for_testing();
111 std::unique_ptr<FakePictureLayerImpl> pending_layer; 111 std::unique_ptr<FakePictureLayerImpl> pending_layer;
112 DCHECK(!pending_root || pending_root->id() == root_id_); 112 DCHECK(!pending_root || pending_root->id() == root_id_);
113 if (!pending_root) { 113 if (!pending_root) {
114 std::unique_ptr<LayerImpl> new_pending_root = 114 std::unique_ptr<LayerImpl> new_pending_root =
115 LayerImpl::Create(pending_tree, root_id_); 115 LayerImpl::Create(pending_tree, root_id_);
116 pending_layer = FakePictureLayerImpl::Create(pending_tree, id_); 116 pending_layer = FakePictureLayerImpl::Create(pending_tree, id_);
117 if (!tile_size.IsEmpty()) 117 if (!tile_size.IsEmpty())
118 pending_layer->set_fixed_tile_size(tile_size); 118 pending_layer->set_fixed_tile_size(tile_size);
119 pending_layer->SetDrawsContent(true); 119 pending_layer->SetDrawsContent(true);
120 pending_layer->SetScrollClipLayer(new_pending_root->id()); 120 pending_layer->SetScrollClipAndCanOverscroll(new_pending_root->id(), false);
121 pending_root = new_pending_root.get(); 121 pending_root = new_pending_root.get();
122 pending_tree->SetRootLayerForTesting(std::move(new_pending_root)); 122 pending_tree->SetRootLayerForTesting(std::move(new_pending_root));
123 } else { 123 } else {
124 pending_layer.reset(static_cast<FakePictureLayerImpl*>( 124 pending_layer.reset(static_cast<FakePictureLayerImpl*>(
125 pending_root->test_properties() 125 pending_root->test_properties()
126 ->RemoveChild(pending_root->test_properties()->children[0]) 126 ->RemoveChild(pending_root->test_properties()->children[0])
127 .release())); 127 .release()));
128 if (!tile_size.IsEmpty()) 128 if (!tile_size.IsEmpty())
129 pending_layer->set_fixed_tile_size(tile_size); 129 pending_layer->set_fixed_tile_size(tile_size);
130 } 130 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2; 174 state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2;
175 state.memory_limit_policy = ALLOW_ANYTHING; 175 state.memory_limit_policy = ALLOW_ANYTHING;
176 state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES; 176 state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES;
177 177
178 host_impl_->resource_pool()->SetResourceUsageLimits( 178 host_impl_->resource_pool()->SetResourceUsageLimits(
179 state.soft_memory_limit_in_bytes, state.num_resources_limit); 179 state.soft_memory_limit_in_bytes, state.num_resources_limit);
180 host_impl_->tile_manager()->SetGlobalStateForTesting(state); 180 host_impl_->tile_manager()->SetGlobalStateForTesting(state);
181 } 181 }
182 182
183 } // namespace cc 183 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698