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 e3df017489fa10d60968342c5f474d149859cb5e..75957f55995c04eb2f58d297e57beb1348118cc6 100644 |
--- a/cc/test/layer_tree_pixel_resource_test.cc |
+++ b/cc/test/layer_tree_pixel_resource_test.cc |
@@ -146,7 +146,8 @@ scoped_ptr<Rasterizer> LayerTreeHostPixelResourceTest::CreateRasterizer( |
return nullptr; |
} |
-void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( |
+ResourceFormat |
+LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( |
LayerTreeHostImpl* host_impl, |
scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool, |
scoped_ptr<ResourcePool>* resource_pool, |
@@ -162,14 +163,15 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( |
ResourceProvider* resource_provider = host_impl->resource_provider(); |
size_t max_transfer_buffer_usage_bytes = 1024u * 1024u * 60u; |
+ ResourceFormat resource_format = resource_provider->best_texture_format(); |
+ |
switch (resource_pool_option_) { |
case BITMAP_TILE_TASK_WORKER_POOL: |
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()); |
+ draw_texture_target_); |
*tile_task_worker_pool = BitmapTileTaskWorkerPool::Create( |
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), |
@@ -180,8 +182,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( |
EXPECT_EQ(PIXEL_TEST_GL, test_type_); |
*resource_pool = |
ResourcePool::Create(resource_provider, |
- draw_texture_target_, |
- resource_provider->best_texture_format()); |
+ draw_texture_target_); |
*tile_task_worker_pool = GpuTileTaskWorkerPool::Create( |
task_runner, TileTaskWorkerPool::GetTaskGraphRunner()); |
@@ -191,9 +192,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_); |
*tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create( |
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), |
@@ -205,31 +204,29 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool( |
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()); |
+ ResourcePool::Create(resource_provider, staging_texture_target_); |
*resource_pool = |
- ResourcePool::Create(resource_provider, |
- draw_texture_target_, |
- resource_provider->best_texture_format()); |
+ ResourcePool::Create(resource_provider, draw_texture_target_); |
*tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create( |
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), |
- context_provider, resource_provider, staging_resource_pool->get()); |
+ context_provider, resource_provider, staging_resource_pool->get(), |
+ resource_format); |
break; |
case PIXEL_BUFFER_TILE_TASK_WORKER_POOL: |
EXPECT_TRUE(context_provider); |
EXPECT_EQ(PIXEL_TEST_GL, test_type_); |
+ resource_format = resource_provider->memory_efficient_texture_format(); |
*resource_pool = ResourcePool::Create( |
- resource_provider, |
- draw_texture_target_, |
- resource_provider->memory_efficient_texture_format()); |
+ resource_provider, draw_texture_target_); |
*tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create( |
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), |
context_provider, resource_provider, max_transfer_buffer_usage_bytes); |
break; |
} |
+ |
+ return resource_format; |
} |
void LayerTreeHostPixelResourceTest::RunPixelResourceTest( |