Re-land: cc: Cleanup internal::WorkerPoolTaskClient interface.

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 b50ac021d80a81dca54ea8f832fd302cb705be8c..108a209996078ff2477c4adf9627489b6806ff7d 100644
--- a/cc/resources/image_raster_worker_pool.cc
+++ b/cc/resources/image_raster_worker_pool.cc
@@ -131,14 +131,15 @@ void ImageRasterWorkerPool::CheckForCompletedTasks() {
 }
 
 SkCanvas* ImageRasterWorkerPool::AcquireCanvasForRaster(
-    internal::RasterWorkerPoolTask* task) {
-  return resource_provider()->MapImageRasterBuffer(task->resource()->id());
+    internal::WorkerPoolTask* task,
+    const Resource* resource) {
+  return resource_provider()->MapImageRasterBuffer(resource->id());
 }
 
-void ImageRasterWorkerPool::OnRasterCompleted(
-    internal::RasterWorkerPoolTask* task,
-    const PicturePileImpl::Analysis& analysis) {
-  resource_provider()->UnmapImageRasterBuffer(task->resource()->id());
+void ImageRasterWorkerPool::ReleaseCanvasForRaster(
+    internal::WorkerPoolTask* task,
+    const Resource* resource) {
+  resource_provider()->UnmapImageRasterBuffer(resource->id());
 }
 
 void ImageRasterWorkerPool::OnRasterTasksFinished() {