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

cc/resources/raster_worker_pool.h

Index: cc/resources/raster_worker_pool.h
diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h
index 521ea9f3aacde9ead7c3eed382f9884f2b265460..0beb87f2695c8c75ac14ad17acb6c3592757e0ae 100644
--- a/cc/resources/raster_worker_pool.h
+++ b/cc/resources/raster_worker_pool.h
@@ -26,14 +26,13 @@ class ResourceProvider;
 namespace internal {
 
 class WorkerPoolTask;
-class RasterWorkerPoolTask;
 
 class CC_EXPORT WorkerPoolTaskClient {
  public:
-  virtual SkCanvas* AcquireCanvasForRaster(RasterWorkerPoolTask* task) = 0;
-  virtual void OnRasterCompleted(RasterWorkerPoolTask* task,
-                                 const PicturePileImpl::Analysis& analysis) = 0;
-  virtual void OnImageDecodeCompleted(WorkerPoolTask* task) = 0;
+  virtual SkCanvas* AcquireCanvasForRaster(WorkerPoolTask* task,
+                                           const Resource* resource) = 0;
+  virtual void ReleaseCanvasForRaster(WorkerPoolTask* task,
+                                      const Resource* resource) = 0;
 
  protected:
   virtual ~WorkerPoolTaskClient() {}