Shared Raster Worker Threads

cc/resources/worker_pool.h

 // Copyright 2013 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_WORKER_POOL_H_
 #define CC_RESOURCES_WORKER_POOL_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 87 matching lines @@
 // A worker thread pool that runs tasks provided by task graph and
 // guarantees completion of all pending tasks at shutdown.
 class CC_EXPORT WorkerPool {
  public:
   virtual ~WorkerPool();
 
   // Tells the worker pool to shutdown and returns once all pending tasks have
   // completed.
   virtual void Shutdown();
 
- protected:
+  // Force a check for completed tasks.
+  virtual void CheckForCompletedWorkerTasks();

[reveman, 2014/01/16 08:00:44]

This function is not virtual anymore and it's already declared below as
protected. Remove this line.

[sohanjg, 2014/01/16 08:56:49]

Done.

+
+  // Gets the number of threads to use for running raster tasks.
+  // TODO(reveman): Move this to RasterWorkerPool: crbug.com/331844
+  static int GetNumRasterThreads();
+
   // 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
   // the number of dependencies.
   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
   // but completion of them is still processed.
   void SetTaskGraph(TaskGraph* graph);
 
   // Force a check for completed tasks.
   void CheckForCompletedWorkerTasks();
 
  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
 
 #endif  // CC_RESOURCES_WORKER_POOL_H_