| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 test_type_ = PIXEL_TEST_GL; | 100 test_type_ = PIXEL_TEST_GL; |
| 101 draw_texture_target_ = GL_TEXTURE_EXTERNAL_OES; | 101 draw_texture_target_ = GL_TEXTURE_EXTERNAL_OES; |
| 102 resource_pool_option_ = ZERO_COPY_TILE_TASK_WORKER_POOL; | 102 resource_pool_option_ = ZERO_COPY_TILE_TASK_WORKER_POOL; |
| 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 std::unique_ptr<TileTaskWorkerPool>* tile_task_worker_pool, |
| 111 scoped_ptr<ResourcePool>* resource_pool) { | 111 std::unique_ptr<ResourcePool>* resource_pool) { |
| 112 base::SingleThreadTaskRunner* task_runner = | 112 base::SingleThreadTaskRunner* task_runner = |
| 113 task_runner_provider()->HasImplThread() | 113 task_runner_provider()->HasImplThread() |
| 114 ? task_runner_provider()->ImplThreadTaskRunner() | 114 ? task_runner_provider()->ImplThreadTaskRunner() |
| 115 : task_runner_provider()->MainThreadTaskRunner(); | 115 : task_runner_provider()->MainThreadTaskRunner(); |
| 116 DCHECK(task_runner); | 116 DCHECK(task_runner); |
| 117 DCHECK(initialized_); | 117 DCHECK(initialized_); |
| 118 | 118 |
| 119 ContextProvider* context_provider = | 119 ContextProvider* context_provider = |
| 120 host_impl->output_surface()->context_provider(); | 120 host_impl->output_surface()->context_provider(); |
| 121 ResourceProvider* resource_provider = host_impl->resource_provider(); | 121 ResourceProvider* resource_provider = host_impl->resource_provider(); |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 if (!IsTestCaseSupported(test_case_)) | 171 if (!IsTestCaseSupported(test_case_)) |
| 172 return; | 172 return; |
| 173 RunPixelTest(test_type_, content_root, file_name); | 173 RunPixelTest(test_type_, content_root, file_name); |
| 174 } | 174 } |
| 175 | 175 |
| 176 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest() | 176 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest() |
| 177 : LayerTreeHostPixelResourceTest(GetParam()) { | 177 : LayerTreeHostPixelResourceTest(GetParam()) { |
| 178 } | 178 } |
| 179 | 179 |
| 180 } // namespace cc | 180 } // namespace cc |
| OLD | NEW |