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

cc/resources/pixel_buffer_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_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 
 #include <deque>
 
 #include "base/containers/hash_tables.h"
 #include "cc/resources/raster_worker_pool.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template <>
-struct hash<cc::internal::RasterWorkerPoolTask*> {
-  size_t operator()(cc::internal::RasterWorkerPoolTask* ptr) const {
+struct hash<cc::internal::WorkerPoolTask*> {
+  size_t operator()(cc::internal::WorkerPoolTask* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 }  // namespace BASE_HASH_NAMESPACE
 #endif  // COMPILER
 
 namespace cc {
 
 class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool {
  public:
   virtual ~PixelBufferRasterWorkerPool();
 
   static scoped_ptr<RasterWorkerPool> Create(
       ResourceProvider* resource_provider,
       size_t max_transfer_buffer_usage_bytes);
 
   // Overridden from RasterWorkerPool:
   virtual void Shutdown() OVERRIDE;
   virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE;
   virtual unsigned GetResourceTarget() const OVERRIDE;
   virtual ResourceFormat GetResourceFormat() const OVERRIDE;
   virtual void CheckForCompletedTasks() OVERRIDE;
 
   // Overridden from internal::WorkerPoolTaskClient:
-  virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task)
-      OVERRIDE;
-  virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task,
-                                 const PicturePileImpl::Analysis& analysis)
-      OVERRIDE;
-  virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE;
+  virtual SkCanvas* AcquireCanvasForRaster(internal::WorkerPoolTask* task,
+                                           const Resource* resource) OVERRIDE;
+  virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
+                                      const Resource* resource) OVERRIDE;
 
  protected:
   PixelBufferRasterWorkerPool(internal::TaskGraphRunner* task_graph_runner,
                               ResourceProvider* resource_provider,
                               size_t max_transfer_buffer_usage_bytes);
 
  private:
-  enum RasterTaskState { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED };
-  typedef std::deque<scoped_refptr<internal::RasterWorkerPoolTask> >
-      RasterTaskDeque;
-  typedef internal::RasterWorkerPoolTask* RasterTaskMapKey;
+  struct RasterTaskState {
+    RasterTaskState() : type(UNSCHEDULED), resource(NULL) {}
+    enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type;
+    const Resource* resource;
+  };
+  typedef internal::WorkerPoolTask* RasterTaskMapKey;
   typedef base::hash_set<RasterTaskMapKey> RasterTaskSet;
   typedef base::hash_map<RasterTaskMapKey, RasterTaskState> RasterTaskStateMap;
 
   // Overridden from RasterWorkerPool:
   virtual void OnRasterTasksFinished() OVERRIDE;
   virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE;
 
   void FlushUploads();
   void CheckForCompletedUploads();
   void ScheduleCheckForCompletedRasterTasks();
   void OnCheckForCompletedRasterTasks();
   void CheckForCompletedRasterTasks();
   void ScheduleMoreTasks();
   unsigned PendingRasterTaskCount() const;
   bool HasPendingTasks() const;
   bool HasPendingTasksRequiredForActivation() const;
   void CheckForCompletedWorkerPoolTasks();
-  bool IsRasterTaskRequiredForActivation(internal::RasterWorkerPoolTask* task)
-      const;
+  bool IsRasterTaskRequiredForActivation(internal::WorkerPoolTask* task) const;
 
   const char* StateName() const;
   scoped_ptr<base::Value> StateAsValue() const;
   scoped_ptr<base::Value> ThrottleStateAsValue() const;
 
   bool shutdown_;
 
   RasterTaskQueue raster_tasks_;
   RasterTaskSet raster_tasks_required_for_activation_;
   RasterTaskStateMap raster_task_states_;
-  RasterTaskDeque raster_tasks_with_pending_upload_;
-  RasterTaskDeque completed_raster_tasks_;
+  TaskDeque raster_tasks_with_pending_upload_;
+  TaskDeque completed_raster_tasks_;
   TaskDeque completed_image_decode_tasks_;
 
   size_t scheduled_raster_task_count_;
   size_t bytes_pending_upload_;
   size_t max_bytes_pending_upload_;
   bool has_performed_uploads_since_last_flush_;
   base::TimeTicks check_for_completed_raster_tasks_time_;
   bool check_for_completed_raster_tasks_pending_;
 
   bool should_notify_client_if_no_tasks_are_pending_;
   bool should_notify_client_if_no_tasks_required_for_activation_are_pending_;
   bool raster_finished_task_pending_;
   bool raster_required_for_activation_finished_task_pending_;
 
   // Task graph used when scheduling tasks and vector used to gather
   // completed tasks.
   internal::TaskGraph graph_;
   internal::Task::Vector completed_tasks_;
 
   base::WeakPtrFactory<PixelBufferRasterWorkerPool> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_