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

cc/resources/direct_raster_worker_pool.cc

Index: cc/resources/direct_raster_worker_pool.cc
diff --git a/cc/resources/direct_raster_worker_pool.cc b/cc/resources/direct_raster_worker_pool.cc
index 947320802d2ee6d1815bd488d973bea48019b12a..9ae00c25e78fbe34892f9412fb51a1af62271d57 100644
--- a/cc/resources/direct_raster_worker_pool.cc
+++ b/cc/resources/direct_raster_worker_pool.cc
@@ -104,14 +104,15 @@ void DirectRasterWorkerPool::CheckForCompletedTasks() {
 }
 
 SkCanvas* DirectRasterWorkerPool::AcquireCanvasForRaster(
-    internal::RasterWorkerPoolTask* task) {
-  return resource_provider()->MapDirectRasterBuffer(task->resource()->id());
+    internal::WorkerPoolTask* task,
+    const Resource* resource) {
+  return resource_provider()->MapDirectRasterBuffer(resource->id());
 }
 
-void DirectRasterWorkerPool::OnRasterCompleted(
-    internal::RasterWorkerPoolTask* task,
-    const PicturePileImpl::Analysis& analysis) {
-  resource_provider()->UnmapDirectRasterBuffer(task->resource()->id());
+void DirectRasterWorkerPool::ReleaseCanvasForRaster(
+    internal::WorkerPoolTask* task,
+    const Resource* resource) {
+  resource_provider()->UnmapDirectRasterBuffer(resource->id());
 }
 
 void DirectRasterWorkerPool::OnRasterTasksFinished() {