| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/resources/tile_task_worker_pool.h" | 5 #include "cc/resources/tile_task_worker_pool.h" |
| 6 | 6 |
| 7 #include "base/test/test_simple_task_runner.h" | 7 #include "base/test/test_simple_task_runner.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "cc/debug/lap_timer.h" | 9 #include "cc/debug/lap_timer.h" |
| 10 #include "cc/output/context_provider.h" | 10 #include "cc/output/context_provider.h" |
| 11 #include "cc/resources/bitmap_tile_task_worker_pool.h" | 11 #include "cc/resources/bitmap_tile_task_worker_pool.h" |
| 12 #include "cc/resources/gpu_rasterizer.h" |
| 12 #include "cc/resources/gpu_tile_task_worker_pool.h" | 13 #include "cc/resources/gpu_tile_task_worker_pool.h" |
| 13 #include "cc/resources/one_copy_tile_task_worker_pool.h" | 14 #include "cc/resources/one_copy_tile_task_worker_pool.h" |
| 14 #include "cc/resources/pixel_buffer_tile_task_worker_pool.h" | 15 #include "cc/resources/pixel_buffer_tile_task_worker_pool.h" |
| 15 #include "cc/resources/raster_buffer.h" | 16 #include "cc/resources/raster_buffer.h" |
| 16 #include "cc/resources/resource_pool.h" | 17 #include "cc/resources/resource_pool.h" |
| 17 #include "cc/resources/resource_provider.h" | 18 #include "cc/resources/resource_provider.h" |
| 18 #include "cc/resources/scoped_resource.h" | 19 #include "cc/resources/scoped_resource.h" |
| 19 #include "cc/resources/tile_task_runner.h" | 20 #include "cc/resources/tile_task_runner.h" |
| 20 #include "cc/resources/zero_copy_tile_task_worker_pool.h" | 21 #include "cc/resources/zero_copy_tile_task_worker_pool.h" |
| 21 #include "cc/test/fake_output_surface.h" | 22 #include "cc/test/fake_output_surface.h" |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 queue->items.push_back( | 222 queue->items.push_back( |
| 222 TileTaskQueue::Item(raster_tasks[i].get(), task_set_collection)); | 223 TileTaskQueue::Item(raster_tasks[i].get(), task_set_collection)); |
| 223 } | 224 } |
| 224 } | 225 } |
| 225 | 226 |
| 226 protected: | 227 protected: |
| 227 scoped_refptr<ContextProvider> context_provider_; | 228 scoped_refptr<ContextProvider> context_provider_; |
| 228 FakeOutputSurfaceClient output_surface_client_; | 229 FakeOutputSurfaceClient output_surface_client_; |
| 229 scoped_ptr<FakeOutputSurface> output_surface_; | 230 scoped_ptr<FakeOutputSurface> output_surface_; |
| 230 scoped_ptr<ResourceProvider> resource_provider_; | 231 scoped_ptr<ResourceProvider> resource_provider_; |
| 232 scoped_ptr<Rasterizer> rasterizer_; |
| 231 scoped_refptr<base::TestSimpleTaskRunner> task_runner_; | 233 scoped_refptr<base::TestSimpleTaskRunner> task_runner_; |
| 232 scoped_ptr<TaskGraphRunner> task_graph_runner_; | 234 scoped_ptr<TaskGraphRunner> task_graph_runner_; |
| 233 LapTimer timer_; | 235 LapTimer timer_; |
| 234 }; | 236 }; |
| 235 | 237 |
| 236 class TileTaskWorkerPoolPerfTest | 238 class TileTaskWorkerPoolPerfTest |
| 237 : public TileTaskWorkerPoolPerfTestBase, | 239 : public TileTaskWorkerPoolPerfTestBase, |
| 238 public testing::TestWithParam<TileTaskWorkerPoolType>, | 240 public testing::TestWithParam<TileTaskWorkerPoolType>, |
| 239 public TileTaskRunnerClient { | 241 public TileTaskRunnerClient { |
| 240 public: | 242 public: |
| (...skipping 19 matching lines...) Expand all Loading... |
| 260 GL_TEXTURE_2D); | 262 GL_TEXTURE_2D); |
| 261 tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create( | 263 tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create( |
| 262 task_runner_.get(), task_graph_runner_.get(), | 264 task_runner_.get(), task_graph_runner_.get(), |
| 263 context_provider_.get(), resource_provider_.get(), | 265 context_provider_.get(), resource_provider_.get(), |
| 264 staging_resource_pool_.get()); | 266 staging_resource_pool_.get()); |
| 265 break; | 267 break; |
| 266 case TILE_TASK_WORKER_POOL_TYPE_GPU: | 268 case TILE_TASK_WORKER_POOL_TYPE_GPU: |
| 267 Create3dOutputSurfaceAndResourceProvider(); | 269 Create3dOutputSurfaceAndResourceProvider(); |
| 268 tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create( | 270 tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create( |
| 269 task_runner_.get(), task_graph_runner_.get(), | 271 task_runner_.get(), task_graph_runner_.get(), |
| 270 resource_provider_.get()); | 272 static_cast<GpuRasterizer*>(rasterizer_.get())); |
| 271 break; | 273 break; |
| 272 case TILE_TASK_WORKER_POOL_TYPE_BITMAP: | 274 case TILE_TASK_WORKER_POOL_TYPE_BITMAP: |
| 273 CreateSoftwareOutputSurfaceAndResourceProvider(); | 275 CreateSoftwareOutputSurfaceAndResourceProvider(); |
| 274 tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create( | 276 tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create( |
| 275 task_runner_.get(), task_graph_runner_.get(), | 277 task_runner_.get(), task_graph_runner_.get(), |
| 276 resource_provider_.get()); | 278 resource_provider_.get()); |
| 277 break; | 279 break; |
| 278 } | 280 } |
| 279 | 281 |
| 280 DCHECK(tile_task_worker_pool_); | 282 DCHECK(tile_task_worker_pool_); |
| (...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 RunBuildTileTaskQueueTest("1_0", 1, 0); | 506 RunBuildTileTaskQueueTest("1_0", 1, 0); |
| 505 RunBuildTileTaskQueueTest("32_0", 32, 0); | 507 RunBuildTileTaskQueueTest("32_0", 32, 0); |
| 506 RunBuildTileTaskQueueTest("1_1", 1, 1); | 508 RunBuildTileTaskQueueTest("1_1", 1, 1); |
| 507 RunBuildTileTaskQueueTest("32_1", 32, 1); | 509 RunBuildTileTaskQueueTest("32_1", 32, 1); |
| 508 RunBuildTileTaskQueueTest("1_4", 1, 4); | 510 RunBuildTileTaskQueueTest("1_4", 1, 4); |
| 509 RunBuildTileTaskQueueTest("32_4", 32, 4); | 511 RunBuildTileTaskQueueTest("32_4", 32, 4); |
| 510 } | 512 } |
| 511 | 513 |
| 512 } // namespace | 514 } // namespace |
| 513 } // namespace cc | 515 } // namespace cc |
| OLD | NEW |