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..63914fce649ee33b0dc596e21ce3f0d98075054f 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() {}
@@ -97,13 +96,13 @@ struct CC_EXPORT RasterTaskQueue {
   struct CC_EXPORT Item {
     class TaskComparator {
      public:
-      explicit TaskComparator(const internal::RasterWorkerPoolTask* task)
+      explicit TaskComparator(const internal::WorkerPoolTask* task)
           : task_(task) {}
 
       bool operator()(const Item& item) const { return item.task == task_; }
 
      private:
-      const internal::RasterWorkerPoolTask* task_;
+      const internal::WorkerPoolTask* task_;
     };
 
     typedef std::vector<Item> Vector;