Re-land: cc: Use worker context for one-copy tile initialization.

cc/raster/tile_task_worker_pool_perftest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/raster/tile_task_worker_pool.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/output/context_provider.h"
@@ skipping 247 matching lines @@
             std::numeric_limits<size_t>::max());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY:
         Create3dOutputSurfaceAndResourceProvider();
         tile_task_worker_pool_ = ZeroCopyTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             resource_provider_.get());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY:
         Create3dOutputSurfaceAndResourceProvider();
-        staging_resource_pool_ = ResourcePool::Create(resource_provider_.get(),
-                                                      GL_TEXTURE_2D);
         tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             context_provider_.get(), resource_provider_.get(),
-            staging_resource_pool_.get(), std::numeric_limits<int>::max(),
-            false);
+            std::numeric_limits<int>::max(), false, GL_TEXTURE_2D,
+            std::numeric_limits<int>::max());
         break;
       case TILE_TASK_WORKER_POOL_TYPE_GPU:
         Create3dOutputSurfaceAndResourceProvider();
         tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create(
             task_runner_.get(), task_graph_runner_.get(),
             context_provider_.get(), resource_provider_.get(), false, 0);
         break;
       case TILE_TASK_WORKER_POOL_TYPE_BITMAP:
         CreateSoftwareOutputSurfaceAndResourceProvider();
         tile_task_worker_pool_ = BitmapTileTaskWorkerPool::Create(
@@ skipping 139 matching lines @@
         return std::string("_one_copy_tile_task_worker_pool");
       case TILE_TASK_WORKER_POOL_TYPE_GPU:
         return std::string("_gpu_tile_task_worker_pool");
       case TILE_TASK_WORKER_POOL_TYPE_BITMAP:
         return std::string("_bitmap_tile_task_worker_pool");
     }
     NOTREACHED();
     return std::string();
   }
 
-  scoped_ptr<ResourcePool> staging_resource_pool_;
   scoped_ptr<TileTaskWorkerPool> tile_task_worker_pool_;
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   TestSharedBitmapManager shared_bitmap_manager_;
 };
 
 TEST_P(TileTaskWorkerPoolPerfTest, ScheduleTasks) {
   RunScheduleTasksTest("1_0", 1, 0);
   RunScheduleTasksTest("32_0", 32, 0);
   RunScheduleTasksTest("1_1", 1, 1);
   RunScheduleTasksTest("32_1", 32, 1);
@@ skipping 66 matching lines @@
   RunBuildTileTaskQueueTest("1_0", 1, 0);
   RunBuildTileTaskQueueTest("32_0", 32, 0);
   RunBuildTileTaskQueueTest("1_1", 1, 1);
   RunBuildTileTaskQueueTest("32_1", 32, 1);
   RunBuildTileTaskQueueTest("1_4", 1, 4);
   RunBuildTileTaskQueueTest("32_4", 32, 4);
 }
 
 }  // namespace
 }  // namespace cc