Shared Raster Worker Threads

cc/resources/worker_pool.h

Index: cc/resources/worker_pool.h
diff --git a/cc/resources/worker_pool.h b/cc/resources/worker_pool.h
old mode 100644
new mode 100755
index cc8c39f3642a0997bc990ba9484aab87612909df..725eda88f730d19ff6fa3c336d938fd09ffa6b71
--- a/cc/resources/worker_pool.h
+++ b/cc/resources/worker_pool.h
@@ -108,7 +108,9 @@ class CC_EXPORT WorkerPool {
   // Force a check for completed tasks.
   virtual void CheckForCompletedTasks();
 
- protected:
+  // Implemented in RWP to avoid circular dependency.
+  static int GetNumRasterThreads();

[reveman, 2014/01/06 20:01:35]

Use the comment from RasterWorkerPool here instead:
// Gets the number of threads to use for running raster tasks.

and add this TODO:
// TODO(reveman): Move this to RasterWorkerPool: crbug.com/331844

[sohanjg, 2014/01/07 08:35:23]

Done.

+
   // A task graph contains a unique set of tasks with edges between
   // dependencies pointing in the direction of the dependents. Each task
   // need to be assigned a unique priority and a run count that matches
@@ -116,8 +118,10 @@ class CC_EXPORT WorkerPool {
   typedef base::ScopedPtrHashMap<internal::WorkerPoolTask*, internal::GraphNode>
       GraphNodeMap;
   typedef GraphNodeMap TaskGraph;
+  typedef std::vector<scoped_refptr<internal::WorkerPoolTask> > TaskVector;
 
-  WorkerPool(size_t num_threads, const std::string& thread_name_prefix);
+ protected:
+  WorkerPool();
 
   // Schedule running of tasks in |graph|. Any previously scheduled tasks
   // that are not already running will be canceled. Canceled tasks don't run
@@ -125,17 +129,9 @@ class CC_EXPORT WorkerPool {
   void SetTaskGraph(TaskGraph* graph);
 
  private:
-  class Inner;
-  friend class Inner;
-
-  typedef std::vector<scoped_refptr<internal::WorkerPoolTask> > TaskVector;
-
   void ProcessCompletedTasks(const TaskVector& completed_tasks);
 
   bool in_dispatch_completion_callbacks_;
-
-  // Hide the gory details of the worker pool in |inner_|.
-  const scoped_ptr<Inner> inner_;
 };
 
 }  // namespace cc