Index: cc/raster/tile_task_worker_pool_unittest.cc |
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc |
index 5e2d1afad27d20e572f3ab27e0ea5975e62e4659..6038b00e89bdb1d543ca64f72643fa0f5fe6e0fa 100644 |
--- a/cc/raster/tile_task_worker_pool_unittest.cc |
+++ b/cc/raster/tile_task_worker_pool_unittest.cc |
@@ -41,7 +41,6 @@ |
const size_t kMaxTransferBufferUsageBytes = 10000U; |
const size_t kMaxBytesPerCopyOperation = 1000U; |
-const size_t kMaxStagingBuffers = 32U; |
// A resource of this dimension^2 * 4 must be greater than the above transfer |
// buffer constant. |
@@ -166,11 +165,12 @@ |
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( |
base::ThreadTaskRunnerHandle::Get().get(), &task_graph_runner_, |
context_provider_.get(), resource_provider_.get(), |
- kMaxBytesPerCopyOperation, false, GL_TEXTURE_2D, |
- kMaxStagingBuffers); |
+ staging_resource_pool_.get(), kMaxBytesPerCopyOperation, false); |
break; |
case TILE_TASK_WORKER_POOL_TYPE_GPU: |
Create3dOutputSurfaceAndResourceProvider(); |
@@ -332,6 +332,7 @@ |
FakeOutputSurfaceClient output_surface_client_; |
scoped_ptr<FakeOutputSurface> output_surface_; |
scoped_ptr<ResourceProvider> resource_provider_; |
+ scoped_ptr<ResourcePool> staging_resource_pool_; |
scoped_ptr<TileTaskWorkerPool> tile_task_worker_pool_; |
TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
TestSharedBitmapManager shared_bitmap_manager_; |