cc: Refactor WorkerPoolTaskClient::AcquireBufferForRaster

cc/resources/image_raster_worker_pool.cc

Index: cc/resources/image_raster_worker_pool.cc
diff --git a/cc/resources/image_raster_worker_pool.cc b/cc/resources/image_raster_worker_pool.cc
index 593e037ede405f388ead155aee3bd7e4b8ac0eff..8a8eff74674ae107c28e202216f690f17351d2f8 100644
--- a/cc/resources/image_raster_worker_pool.cc
+++ b/cc/resources/image_raster_worker_pool.cc
@@ -155,20 +155,22 @@ void ImageRasterWorkerPool::CheckForCompletedTasks() {
   CheckForCompletedGpuRasterTasks();
 }
 
-void* ImageRasterWorkerPool::AcquireBufferForRaster(
-    internal::RasterWorkerPoolTask* task,
-    int* stride) {
-  // Acquire image for resource.
-  resource_provider()->AcquireImage(task->resource()->id());
+SkCanvas* ImageRasterWorkerPool::AcquireCanvasForRaster(
+    internal::RasterWorkerPoolTask* task) {
+  if (task->use_gpu_rasterization())
+    return resource_provider()->MapDirectRasterBuffer(task->resource()->id());
 
-  *stride = resource_provider()->GetImageStride(task->resource()->id());
-  return resource_provider()->MapImage(task->resource()->id());
+  return resource_provider()->MapImageRasterBuffer(task->resource()->id());
 }
 
 void ImageRasterWorkerPool::OnRasterCompleted(
     internal::RasterWorkerPoolTask* task,
     const PicturePileImpl::Analysis& analysis) {
-  resource_provider()->UnmapImage(task->resource()->id());
+  if (task->use_gpu_rasterization()) {
+    resource_provider()->UnmapDirectRasterBuffer(task->resource()->id());
+    return;
+  }
+  resource_provider()->UnmapImageRasterBuffer(task->resource()->id());
 }
 
 void ImageRasterWorkerPool::OnImageDecodeCompleted(