| Index: cc/test/layer_tree_pixel_resource_test.cc
|
| diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
|
| index 1839643880b45ad4f95f3d6623ddf866dcc17782..7c9b746b483d587caac987caafde6e7d482a03d8 100644
|
| --- a/cc/test/layer_tree_pixel_resource_test.cc
|
| +++ b/cc/test/layer_tree_pixel_resource_test.cc
|
| @@ -112,9 +112,9 @@ void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
|
| NOTREACHED();
|
| }
|
|
|
| -void LayerTreeHostPixelResourceTest::CreateResourceAndRasterWorkerPool(
|
| +void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
|
| LayerTreeHostImpl* host_impl,
|
| - scoped_ptr<RasterWorkerPool>* raster_worker_pool,
|
| + scoped_ptr<TileTaskWorkerPool>* raster_worker_pool,
|
| scoped_ptr<ResourcePool>* resource_pool,
|
| scoped_ptr<ResourcePool>* staging_resource_pool) {
|
| base::SingleThreadTaskRunner* task_runner =
|
| @@ -137,10 +137,9 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndRasterWorkerPool(
|
| draw_texture_target_,
|
| resource_provider->best_texture_format());
|
|
|
| - *raster_worker_pool =
|
| - BitmapRasterWorkerPool::Create(task_runner,
|
| - RasterWorkerPool::GetTaskGraphRunner(),
|
| - resource_provider);
|
| + *raster_worker_pool = BitmapTileTaskWorkerPool::Create(
|
| + task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| + resource_provider);
|
| break;
|
| case GPU_RASTER_WORKER_POOL:
|
| EXPECT_TRUE(context_provider);
|
| @@ -150,11 +149,9 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndRasterWorkerPool(
|
| draw_texture_target_,
|
| resource_provider->best_texture_format());
|
|
|
| - *raster_worker_pool =
|
| - GpuRasterWorkerPool::Create(task_runner,
|
| - context_provider,
|
| - resource_provider,
|
| - use_distance_field_text);
|
| + *raster_worker_pool = GpuTileTaskWorkerPool::Create(
|
| + task_runner, context_provider, resource_provider,
|
| + use_distance_field_text);
|
| break;
|
| case ZERO_COPY_RASTER_WORKER_POOL:
|
| EXPECT_TRUE(context_provider);
|
| @@ -165,9 +162,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndRasterWorkerPool(
|
| draw_texture_target_,
|
| resource_provider->best_texture_format());
|
|
|
| - *raster_worker_pool = ZeroCopyRasterWorkerPool::Create(
|
| - task_runner,
|
| - RasterWorkerPool::GetTaskGraphRunner(),
|
| + *raster_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
|
| + task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| resource_provider);
|
| break;
|
| case ONE_COPY_RASTER_WORKER_POOL:
|
| @@ -184,12 +180,9 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndRasterWorkerPool(
|
| draw_texture_target_,
|
| resource_provider->best_texture_format());
|
|
|
| - *raster_worker_pool = OneCopyRasterWorkerPool::Create(
|
| - task_runner,
|
| - RasterWorkerPool::GetTaskGraphRunner(),
|
| - context_provider,
|
| - resource_provider,
|
| - staging_resource_pool->get());
|
| + *raster_worker_pool = OneCopyTileTaskWorkerPool::Create(
|
| + task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| + context_provider, resource_provider, staging_resource_pool->get());
|
| break;
|
| case PIXEL_BUFFER_RASTER_WORKER_POOL:
|
| EXPECT_TRUE(context_provider);
|
| @@ -199,12 +192,9 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndRasterWorkerPool(
|
| draw_texture_target_,
|
| resource_provider->memory_efficient_texture_format());
|
|
|
| - *raster_worker_pool = PixelBufferRasterWorkerPool::Create(
|
| - task_runner,
|
| - RasterWorkerPool::GetTaskGraphRunner(),
|
| - context_provider,
|
| - resource_provider,
|
| - max_transfer_buffer_usage_bytes);
|
| + *raster_worker_pool = PixelBufferTileTaskWorkerPool::Create(
|
| + task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| + context_provider, resource_provider, max_transfer_buffer_usage_bytes);
|
| break;
|
| }
|
| }
|
|
|