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

cc/resources/raster_worker_pool.cc

Index: cc/resources/raster_worker_pool.cc
diff --git a/cc/resources/raster_worker_pool.cc b/cc/resources/raster_worker_pool.cc
index 925cf94b28afa01633d109f353bb7bd558c8babb..7df47c833798d51b6c69fbff9f32239203247efe 100644
--- a/cc/resources/raster_worker_pool.cc
+++ b/cc/resources/raster_worker_pool.cc
@@ -112,7 +112,7 @@ class RasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
   virtual void ScheduleOnOriginThread(internal::WorkerPoolTaskClient* client)
       OVERRIDE {
     DCHECK(!canvas_);
-    canvas_ = client->AcquireCanvasForRaster(this);
+    canvas_ = client->AcquireCanvasForRaster(this, resource());
   }
   virtual void RunOnOriginThread() OVERRIDE {
     TRACE_EVENT0("cc", "RasterWorkerPoolTaskImpl::RunOnOriginThread");
@@ -135,7 +135,7 @@ class RasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
   virtual void CompleteOnOriginThread(internal::WorkerPoolTaskClient* client)
       OVERRIDE {
     canvas_ = NULL;
-    client->OnRasterCompleted(this, analysis_);
+    client->ReleaseCanvasForRaster(this, resource());
   }
   virtual void RunReplyOnOriginThread() OVERRIDE {
     DCHECK(!canvas_);
@@ -270,9 +270,7 @@ class ImageDecodeWorkerPoolTaskImpl : public internal::WorkerPoolTask {
     Decode();
   }
   virtual void CompleteOnOriginThread(internal::WorkerPoolTaskClient* client)
-      OVERRIDE {
-    client->OnImageDecodeCompleted(this);
-  }
+      OVERRIDE {}
   virtual void RunReplyOnOriginThread() OVERRIDE {
     reply_.Run(!HasFinishedRunning());
   }