| OLD | NEW |
| 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_compositor_frame_sink.h" | 7 #include "cc/test/fake_compositor_frame_sink.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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 LayerImpl* pending_root = pending_tree->root_layer_for_testing(); | 112 LayerImpl* pending_root = pending_tree->root_layer_for_testing(); |
| 113 std::unique_ptr<FakePictureLayerImpl> pending_layer; | 113 std::unique_ptr<FakePictureLayerImpl> pending_layer; |
| 114 DCHECK(!pending_root || pending_root->id() == root_id_); | 114 DCHECK(!pending_root || pending_root->id() == root_id_); |
| 115 if (!pending_root) { | 115 if (!pending_root) { |
| 116 std::unique_ptr<LayerImpl> new_pending_root = | 116 std::unique_ptr<LayerImpl> new_pending_root = |
| 117 LayerImpl::Create(pending_tree, root_id_); | 117 LayerImpl::Create(pending_tree, root_id_); |
| 118 pending_layer = FakePictureLayerImpl::Create(pending_tree, id_); | 118 pending_layer = FakePictureLayerImpl::Create(pending_tree, id_); |
| 119 if (!tile_size.IsEmpty()) | 119 if (!tile_size.IsEmpty()) |
| 120 pending_layer->set_fixed_tile_size(tile_size); | 120 pending_layer->set_fixed_tile_size(tile_size); |
| 121 pending_layer->SetDrawsContent(true); | 121 pending_layer->SetDrawsContent(true); |
| 122 pending_layer->SetScrollClipLayer(new_pending_root->id()); | 122 pending_layer->SetScrollClipAndCanOverscroll(new_pending_root->id(), false); |
| 123 pending_root = new_pending_root.get(); | 123 pending_root = new_pending_root.get(); |
| 124 pending_tree->SetRootLayerForTesting(std::move(new_pending_root)); | 124 pending_tree->SetRootLayerForTesting(std::move(new_pending_root)); |
| 125 } else { | 125 } else { |
| 126 pending_layer.reset(static_cast<FakePictureLayerImpl*>( | 126 pending_layer.reset(static_cast<FakePictureLayerImpl*>( |
| 127 pending_root->test_properties() | 127 pending_root->test_properties() |
| 128 ->RemoveChild(pending_root->test_properties()->children[0]) | 128 ->RemoveChild(pending_root->test_properties()->children[0]) |
| 129 .release())); | 129 .release())); |
| 130 if (!tile_size.IsEmpty()) | 130 if (!tile_size.IsEmpty()) |
| 131 pending_layer->set_fixed_tile_size(tile_size); | 131 pending_layer->set_fixed_tile_size(tile_size); |
| 132 } | 132 } |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2; | 176 state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2; |
| 177 state.memory_limit_policy = ALLOW_ANYTHING; | 177 state.memory_limit_policy = ALLOW_ANYTHING; |
| 178 state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES; | 178 state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES; |
| 179 | 179 |
| 180 host_impl_->resource_pool()->SetResourceUsageLimits( | 180 host_impl_->resource_pool()->SetResourceUsageLimits( |
| 181 state.soft_memory_limit_in_bytes, state.num_resources_limit); | 181 state.soft_memory_limit_in_bytes, state.num_resources_limit); |
| 182 host_impl_->tile_manager()->SetGlobalStateForTesting(state); | 182 host_impl_->tile_manager()->SetGlobalStateForTesting(state); |
| 183 } | 183 } |
| 184 | 184 |
| 185 } // namespace cc | 185 } // namespace cc |
| OLD | NEW |