cc: Separate RasterWorkerPool interface from implementation details.

cc/resources/direct_raster_worker_pool.h

Index: cc/resources/direct_raster_worker_pool.h
diff --git a/cc/resources/direct_raster_worker_pool.h b/cc/resources/direct_raster_worker_pool.h
index 74013b681d6a4c624b0382681b2d2e602fa4fcc6..e4022f6de937be01c85b71952f8bd86d8bd04a32 100644
--- a/cc/resources/direct_raster_worker_pool.h
+++ b/cc/resources/direct_raster_worker_pool.h
@@ -7,49 +7,51 @@
 
 #include "base/memory/weak_ptr.h"
 #include "cc/resources/raster_worker_pool.h"
+#include "cc/resources/rasterizer.h"
 
 namespace cc {
 class ContextProvider;
 class ResourceProvider;
 
 class CC_EXPORT DirectRasterWorkerPool : public RasterWorkerPool,
-                                         public internal::WorkerPoolTaskClient {
+                                         public Rasterizer,
+                                         public internal::RasterizerTaskClient {
  public:
   virtual ~DirectRasterWorkerPool();
 
-  static scoped_ptr<DirectRasterWorkerPool> Create(
+  static scoped_ptr<RasterWorkerPool> Create(
       base::SequencedTaskRunner* task_runner,
       ResourceProvider* resource_provider,
       ContextProvider* context_provider);
 
   // Overridden from RasterWorkerPool:
-  virtual void SetClient(RasterWorkerPoolClient* client) OVERRIDE;
+  virtual Rasterizer* AsRasterizer() OVERRIDE;
+
+  // Overridden from Rasterizer:
+  virtual void SetClient(RasterizerClient* client) OVERRIDE;
   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::WorkerPoolTask* task,
-                                           const Resource* resource) OVERRIDE;
-  virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
-                                      const Resource* resource) OVERRIDE;
+  // Overridden from internal::RasterizerTaskClient:
+  virtual SkCanvas* AcquireCanvasForRaster(internal::RasterTask* task) OVERRIDE;
+  virtual void ReleaseCanvasForRaster(internal::RasterTask* task) OVERRIDE;
 
- protected:
+ private:
   DirectRasterWorkerPool(base::SequencedTaskRunner* task_runner,
                          ResourceProvider* resource_provider,
                          ContextProvider* context_provider);
 
- private:
   void OnRasterFinished();
   void OnRasterRequiredForActivationFinished();
   void ScheduleRunTasksOnOriginThread();
   void RunTasksOnOriginThread();
-  void RunTaskOnOriginThread(internal::WorkerPoolTask* task);
+  void RunTaskOnOriginThread(internal::RasterizerTask* task);
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
-  RasterWorkerPoolClient* client_;
+  RasterizerClient* client_;
   ResourceProvider* resource_provider_;
   ContextProvider* context_provider_;
 
@@ -63,11 +65,11 @@ class CC_EXPORT DirectRasterWorkerPool : public RasterWorkerPool,
   base::WeakPtrFactory<DirectRasterWorkerPool>
       raster_finished_weak_ptr_factory_;
 
-  scoped_refptr<internal::WorkerPoolTask> raster_finished_task_;
-  scoped_refptr<internal::WorkerPoolTask>
+  scoped_refptr<internal::RasterizerTask> raster_finished_task_;
+  scoped_refptr<internal::RasterizerTask>
       raster_required_for_activation_finished_task_;
 
-  internal::WorkerPoolTask::Vector completed_tasks_;
+  internal::RasterizerTask::Vector completed_tasks_;
 
   base::WeakPtrFactory<DirectRasterWorkerPool> weak_ptr_factory_;