cc: Add RasterWorkerPool class.

cc/tile_manager.h

Index: cc/tile_manager.h
diff --git a/cc/tile_manager.h b/cc/tile_manager.h
index 857f88908c83617912d553626fc9f4d521fbc35c..faf92385136a4eb2ffaff7ab95f4520e0b85d280 100644
--- a/cc/tile_manager.h
+++ b/cc/tile_manager.h
@@ -12,16 +12,15 @@
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "cc/rendering_stats.h"
 #include "cc/resource_pool.h"
 #include "cc/tile_priority.h"
 
 namespace cc {
-
-class RasterThread;
+class RasterWorker;
 class ResourceProvider;
 class Tile;
 class TileVersion;
-struct RenderingStats;
 
 class CC_EXPORT TileManagerClient {
  public:
@@ -77,7 +76,9 @@ class CC_EXPORT TileManager {
               size_t num_raster_threads);
   virtual ~TileManager();
 
-  const GlobalStateThatImpactsTilePriority& GlobalState() const { return global_state_; }
+  const GlobalStateThatImpactsTilePriority& GlobalState() const {
+      return global_state_;
+  }
   void SetGlobalState(const GlobalStateThatImpactsTilePriority& state);
 
   void ManageTiles();
@@ -91,36 +92,34 @@ class CC_EXPORT TileManager {
  protected:
   // Methods called by Tile
   friend class Tile;
-  void RegisterTile(Tile*);
-  void UnregisterTile(Tile*);
-  void WillModifyTilePriority(Tile*, WhichTree, const TilePriority& new_priority);
+  void RegisterTile(Tile* tile);
+  void UnregisterTile(Tile* tile);
+  void WillModifyTilePriority(
+      Tile* tile, WhichTree tree, const TilePriority& new_priority);
 
  private:
   void ResetBinCounts();
   void AssignGpuMemoryToTiles();
-  void FreeResourcesForTile(Tile*);
+  void FreeResourcesForTile(Tile* tile);
   void ScheduleManageTiles();
   void ScheduleCheckForCompletedSetPixels();
   void DispatchMoreTasks();
-  void DispatchOneRasterTask(RasterThread*, scoped_refptr<Tile>);
-  void OnRasterTaskCompleted(
-      scoped_refptr<Tile>,
-      scoped_ptr<ResourcePool::Resource>,
-      scoped_refptr<PicturePileImpl>,
-      int manage_tiles_call_count_when_dispatched,
-      RenderingStats*);
-  void DidFinishTileInitialization(Tile*);
-  void DispatchImageDecodingTasksForTile(Tile*);
-  void OnImageDecodingTaskCompleted(scoped_refptr<Tile>,
-                                    uint32_t,
-                                    RenderingStats*);
+  void GatherPixelRefsForTile(Tile* tile);
+  void DispatchImageDecodingTasksForTile(Tile* tile);
   void DispatchOneImageDecodingTask(
-      RasterThread*, scoped_refptr<Tile>, skia::LazyPixelRef*);
-  void GatherPixelRefsForTile(Tile*);
-  RasterThread* GetFreeRasterThread();
+      scoped_refptr<Tile> tile, skia::LazyPixelRef* pixel_ref);
+  void OnImageDecodingTaskCompleted(
+      scoped_refptr<Tile> tile, uint32_t pixel_ref_id);
+  void DispatchOneRasterTask(scoped_refptr<Tile> tile);
+  void OnRasterTaskCompleted(
+      scoped_refptr<Tile> tile,
+      scoped_ptr<ResourcePool::Resource> resource,
+      int manage_tiles_call_count_when_dispatched);
+  void DidFinishTileInitialization(Tile* tile);
 
   TileManagerClient* client_;
   scoped_ptr<ResourcePool> resource_pool_;
+  scoped_ptr<RasterWorker> raster_worker_;
   bool manage_tiles_pending_;
   int manage_tiles_call_count_;
   bool check_for_completed_set_pixels_pending_;
@@ -145,9 +144,6 @@ class CC_EXPORT TileManager {
   typedef std::queue<scoped_refptr<Tile> > TileQueue;
   TileQueue tiles_with_pending_set_pixels_;
 
-  typedef ScopedPtrVector<RasterThread> RasterThreadVector;
-  RasterThreadVector raster_threads_;
-
   RenderingStats rendering_stats_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);