Revert of cc: Cleanup internal::WorkerPoolTaskClient interface.

cc/resources/raster_worker_pool.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_RASTER_WORKER_POOL_H_
 
 #include <deque>
 #include <vector>
 
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "cc/resources/picture_pile_impl.h"
 #include "cc/resources/raster_mode.h"
 #include "cc/resources/resource_format.h"
 #include "cc/resources/task_graph_runner.h"
 #include "cc/resources/tile_priority.h"
 
 class SkPixelRef;
 
 namespace cc {
 
 class ContextProvider;
 class Resource;
 class ResourceProvider;
 
 namespace internal {
 
 class WorkerPoolTask;
+class RasterWorkerPoolTask;
 
 class CC_EXPORT WorkerPoolTaskClient {
  public:
-  virtual SkCanvas* AcquireCanvasForRaster(WorkerPoolTask* task,
-                                           const Resource* resource) = 0;
-  virtual void ReleaseCanvasForRaster(WorkerPoolTask* task,
-                                      const Resource* resource) = 0;
+  virtual SkCanvas* AcquireCanvasForRaster(RasterWorkerPoolTask* task) = 0;
+  virtual void OnRasterCompleted(RasterWorkerPoolTask* task,
+                                 const PicturePileImpl::Analysis& analysis) = 0;
+  virtual void OnImageDecodeCompleted(WorkerPoolTask* task) = 0;
 
  protected:
   virtual ~WorkerPoolTaskClient() {}
 };
 
 class CC_EXPORT WorkerPoolTask : public Task {
  public:
   typedef std::vector<scoped_refptr<WorkerPoolTask> > Vector;
 
   virtual void ScheduleOnOriginThread(WorkerPoolTaskClient* client) = 0;
@@ skipping 43 matching lines @@
   virtual void DidFinishRunningTasksRequiredForActivation() = 0;
 
  protected:
   virtual ~RasterWorkerPoolClient() {}
 };
 
 struct CC_EXPORT RasterTaskQueue {
   struct CC_EXPORT Item {
     class TaskComparator {
      public:
-      explicit TaskComparator(const internal::WorkerPoolTask* task)
+      explicit TaskComparator(const internal::RasterWorkerPoolTask* task)
           : task_(task) {}
 
       bool operator()(const Item& item) const { return item.task == task_; }
 
      private:
-      const internal::WorkerPoolTask* task_;
+      const internal::RasterWorkerPoolTask* task_;
     };
 
     typedef std::vector<Item> Vector;
 
     Item(internal::RasterWorkerPoolTask* task, bool required_for_activation);
     ~Item();
 
     static bool IsRequiredForActivation(const Item& item) {
       return item.required_for_activation;
     }
@@ skipping 136 matching lines @@
 
   scoped_refptr<internal::WorkerPoolTask> raster_finished_task_;
   scoped_refptr<internal::WorkerPoolTask>
       raster_required_for_activation_finished_task_;
   base::WeakPtrFactory<RasterWorkerPool> weak_ptr_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RASTER_WORKER_POOL_H_