cc: Renaming Rasterizer and RasterWorkerPool interfaces

cc/resources/gpu_raster_worker_pool.h

Index: cc/resources/gpu_raster_worker_pool.h
diff --git a/cc/resources/gpu_raster_worker_pool.h b/cc/resources/gpu_raster_worker_pool.h
index c5ff13f1361b0248f87b93e0204afd0c1deeea4b..2b249a912d2118cc3b96d828eb0af8731b0353ce 100644
--- a/cc/resources/gpu_raster_worker_pool.h
+++ b/cc/resources/gpu_raster_worker_pool.h
@@ -7,54 +7,54 @@
 
 #include "base/memory/weak_ptr.h"
 #include "cc/resources/raster_worker_pool.h"
-#include "cc/resources/rasterizer.h"
+#include "cc/resources/tile_task_runner.h"
 #include "third_party/skia/include/core/SkMultiPictureDraw.h"
 
 namespace cc {
 class ContextProvider;
 class ResourceProvider;
 
-class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
-                                      public Rasterizer,
-                                      public RasterizerTaskClient {
+class CC_EXPORT GpuTileTaskWorkerPool : public TileTaskWorkerPool,
+                                        public TileTaskRunner,
+                                        public TileTaskClient {
  public:
-  ~GpuRasterWorkerPool() override;
+  ~GpuTileTaskWorkerPool() override;
 
-  static scoped_ptr<RasterWorkerPool> Create(
+  static scoped_ptr<TileTaskWorkerPool> Create(
       base::SequencedTaskRunner* task_runner,
       ContextProvider* context_provider,
       ResourceProvider* resource_provider,
       bool use_distance_field_text);
 
-  // Overridden from RasterWorkerPool:
-  Rasterizer* AsRasterizer() override;
+  // Overridden from TileTaskWorkerPool:
+  TileTaskRunner* AsTileTaskRunner() override;
 
-  // Overridden from Rasterizer:
-  void SetClient(RasterizerClient* client) override;
+  // Overridden from TileTaskRunner:
+  void SetClient(TileTaskRunnerClient* client) override;
   void Shutdown() override;
-  void ScheduleTasks(RasterTaskQueue* queue) override;
+  void ScheduleTasks(TileTaskQueue* queue) override;
   void CheckForCompletedTasks() override;
 
-  // Overridden from RasterizerTaskClient:
+  // Overridden from TileTaskClient:
   scoped_ptr<RasterBuffer> AcquireBufferForRaster(
       const Resource* resource) override;
   void ReleaseBufferForRaster(scoped_ptr<RasterBuffer> buffer) override;
 
  private:
-  GpuRasterWorkerPool(base::SequencedTaskRunner* task_runner,
-                      ContextProvider* context_provider,
-                      ResourceProvider* resource_provider,
-                      bool use_distance_field_text);
+  GpuTileTaskWorkerPool(base::SequencedTaskRunner* task_runner,
+                        ContextProvider* context_provider,
+                        ResourceProvider* resource_provider,
+                        bool use_distance_field_text);
 
-  void OnRasterFinished(TaskSet task_set);
+  void OnTaskSetFinished(TaskSet task_set);
   void ScheduleRunTasksOnOriginThread();
   void RunTasksOnOriginThread();
-  void RunTaskOnOriginThread(RasterizerTask* task);
+  void RunTaskOnOriginThread(TileTask* task);
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   scoped_ptr<TaskGraphRunner> task_graph_runner_;
   const NamespaceToken namespace_token_;
-  RasterizerClient* client_;
+  TileTaskRunnerClient* client_;
   ContextProvider* context_provider_;
   ResourceProvider* resource_provider_;
   SkMultiPictureDraw multi_picture_draw_;
@@ -62,20 +62,21 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
   bool run_tasks_on_origin_thread_pending_;
   bool use_distance_field_text_;
 
-  TaskSetCollection raster_pending_;
+  TaskSetCollection tasks_pending_;
 
-  scoped_refptr<RasterizerTask> raster_finished_tasks_[kNumberOfTaskSets];
+  scoped_refptr<TileTask> task_set_finished_tasks_[kNumberOfTaskSets];
 
   // Task graph used when scheduling tasks and vector used to gather
   // completed tasks.
   TaskGraph graph_;
   Task::Vector completed_tasks_;
 
-  base::WeakPtrFactory<GpuRasterWorkerPool> raster_finished_weak_ptr_factory_;
+  base::WeakPtrFactory<GpuTileTaskWorkerPool>
+      task_set_finished_weak_ptr_factory_;
 
-  base::WeakPtrFactory<GpuRasterWorkerPool> weak_ptr_factory_;
+  base::WeakPtrFactory<GpuTileTaskWorkerPool> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(GpuRasterWorkerPool);
+  DISALLOW_COPY_AND_ASSIGN(GpuTileTaskWorkerPool);
 };
 
 }  // namespace cc