| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/layer_tree_pixel_resource_test.h" | 5 #include "cc/test/layer_tree_pixel_resource_test.h" |
| 6 | 6 |
| 7 #include "cc/layers/layer.h" | 7 #include "cc/layers/layer.h" |
| 8 #include "cc/raster/bitmap_tile_task_worker_pool.h" | 8 #include "cc/raster/bitmap_tile_task_worker_pool.h" |
| 9 #include "cc/raster/gpu_rasterizer.h" | 9 #include "cc/raster/gpu_rasterizer.h" |
| 10 #include "cc/raster/gpu_tile_task_worker_pool.h" | 10 #include "cc/raster/gpu_tile_task_worker_pool.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 return; | 103 return; |
| 104 } | 104 } |
| 105 NOTREACHED(); | 105 NOTREACHED(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( | 108 void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( |
| 109 LayerTreeHostImpl* host_impl, | 109 LayerTreeHostImpl* host_impl, |
| 110 scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool, | 110 scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool, |
| 111 scoped_ptr<ResourcePool>* resource_pool) { | 111 scoped_ptr<ResourcePool>* resource_pool) { |
| 112 base::SingleThreadTaskRunner* task_runner = | 112 base::SingleThreadTaskRunner* task_runner = |
| 113 proxy()->HasImplThread() ? proxy()->ImplThreadTaskRunner() | 113 task_runner_provider()->HasImplThread() |
| 114 : proxy()->MainThreadTaskRunner(); | 114 ? task_runner_provider()->ImplThreadTaskRunner() |
| 115 : task_runner_provider()->MainThreadTaskRunner(); |
| 115 DCHECK(task_runner); | 116 DCHECK(task_runner); |
| 116 DCHECK(initialized_); | 117 DCHECK(initialized_); |
| 117 | 118 |
| 118 ContextProvider* context_provider = | 119 ContextProvider* context_provider = |
| 119 host_impl->output_surface()->context_provider(); | 120 host_impl->output_surface()->context_provider(); |
| 120 ResourceProvider* resource_provider = host_impl->resource_provider(); | 121 ResourceProvider* resource_provider = host_impl->resource_provider(); |
| 121 int max_bytes_per_copy_operation = 1024 * 1024; | 122 int max_bytes_per_copy_operation = 1024 * 1024; |
| 122 int max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024; | 123 int max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024; |
| 123 | 124 |
| 124 switch (resource_pool_option_) { | 125 switch (resource_pool_option_) { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 if (!IsTestCaseSupported(test_case_)) | 173 if (!IsTestCaseSupported(test_case_)) |
| 173 return; | 174 return; |
| 174 RunPixelTest(test_type_, content_root, file_name); | 175 RunPixelTest(test_type_, content_root, file_name); |
| 175 } | 176 } |
| 176 | 177 |
| 177 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest() | 178 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest() |
| 178 : LayerTreeHostPixelResourceTest(GetParam()) { | 179 : LayerTreeHostPixelResourceTest(GetParam()) { |
| 179 } | 180 } |
| 180 | 181 |
| 181 } // namespace cc | 182 } // namespace cc |
| OLD | NEW |