cc: Separate RasterWorkerPool interface from implementation details.

cc/resources/direct_raster_worker_pool.h

 // Copyright 2014 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_DIRECT_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_
 
 #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_;
 
   bool run_tasks_on_origin_thread_pending_;
 
   RasterTaskQueue raster_tasks_;
 
   bool raster_tasks_pending_;
   bool raster_tasks_required_for_activation_pending_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_DIRECT_RASTER_WORKER_POOL_H_