| 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 d5b5127e0fde3eb36c8ba64abb7ebb942d9184d1..912348f3c725a65ffbad909a2bb5b0d14d3786c2 100644
|
| --- a/cc/test/layer_tree_pixel_resource_test.cc
|
| +++ b/cc/test/layer_tree_pixel_resource_test.cc
|
| @@ -133,9 +133,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
|
| EXPECT_FALSE(context_provider);
|
| EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_);
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider,
|
| - draw_texture_target_,
|
| - resource_provider->best_texture_format());
|
| + ResourcePool::Create(resource_provider, draw_texture_target_, false);
|
|
|
| *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -145,9 +143,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
|
| EXPECT_TRUE(context_provider);
|
| EXPECT_EQ(PIXEL_TEST_GL, test_type_);
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider,
|
| - draw_texture_target_,
|
| - resource_provider->best_texture_format());
|
| + ResourcePool::Create(resource_provider, draw_texture_target_, false);
|
|
|
| *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
|
| task_runner, context_provider, resource_provider,
|
| @@ -158,9 +154,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
|
| EXPECT_EQ(PIXEL_TEST_GL, test_type_);
|
| EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider,
|
| - draw_texture_target_,
|
| - resource_provider->best_texture_format());
|
| + ResourcePool::Create(resource_provider, draw_texture_target_, false);
|
|
|
| *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -171,14 +165,10 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
|
| EXPECT_EQ(PIXEL_TEST_GL, test_type_);
|
| EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
|
| // We need to create a staging resource pool when using copy rasterizer.
|
| - *staging_resource_pool =
|
| - ResourcePool::Create(resource_provider,
|
| - staging_texture_target_,
|
| - resource_provider->best_texture_format());
|
| + *staging_resource_pool = ResourcePool::Create(
|
| + resource_provider, staging_texture_target_, false);
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider,
|
| - draw_texture_target_,
|
| - resource_provider->best_texture_format());
|
| + ResourcePool::Create(resource_provider, draw_texture_target_, false);
|
|
|
| *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -187,10 +177,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
|
| case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
|
| EXPECT_TRUE(context_provider);
|
| EXPECT_EQ(PIXEL_TEST_GL, test_type_);
|
| - *resource_pool = ResourcePool::Create(
|
| - resource_provider,
|
| - draw_texture_target_,
|
| - resource_provider->memory_efficient_texture_format());
|
| + *resource_pool =
|
| + ResourcePool::Create(resource_provider, draw_texture_target_, false);
|
|
|
| *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
|
|