cc: Generalize raster task notifications

cc/resources/raster_worker_pool.h

Index: cc/resources/raster_worker_pool.h
diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h
index 5a9fd25137bdfe53f60c299c83cdbb0b7c1f2783..16e9c6e7ae5a33322e6ef3a09fb09f69ec3d5f30 100644
--- a/cc/resources/raster_worker_pool.h
+++ b/cc/resources/raster_worker_pool.h
@@ -18,9 +18,23 @@ class CC_EXPORT RasterWorkerPool {
   static unsigned kOnDemandRasterTaskPriority;
   static unsigned kBenchmarkRasterTaskPriority;
   static unsigned kRasterFinishedTaskPriority;
-  static unsigned kRasterRequiredForActivationFinishedTaskPriority;
   static unsigned kRasterTaskPriorityBase;
 
+  class TaskSetSizes {

[reveman, 2014/09/12 16:33:51]

While convenient, I find the use of this class with its overloaded operators a
bit hard to read. It's fine for PBRWP as I don't see a better way to keep track
of all these counts there. However, I'd like it to be constrained to that class
(PixelBufferRasterWorkerPool) and simply use "size_t
task_count[kNumberOfTaskSets]" elsewhere.

The reasoning would be that all this counting will go away as we remove/refactor
synthetic delays, except for PBRWP where we still need it (and PBRWP might just
go away completely if 1-copy works out as expected). I'd rather not have it
exposed through the Rasterizer API if not needed long term. I've been wanting to
remove the existing count from the Rasterizer API for some time and adding
something more complicated there would be sad..

[ernstm, 2014/09/13 01:26:51]

Done.

+   public:
+    TaskSetSizes();
+    explicit TaskSetSizes(const RasterTaskQueue* queue);

[reveman, 2014/09/12 16:33:51]

nit: blank line between ctor/dtor and other functions.

[ernstm, 2014/09/13 01:26:51]

Done.

+    TaskSetCollection ToTaskSetCollection() const;
+    size_t& operator[](TaskSet task_set);
+    const size_t& operator[](TaskSet task_set) const;
+    bool operator==(const TaskSetSizes& other) const;
+    void operator+=(const TaskSetCollection& task_set_collection);
+    void operator-=(const TaskSetCollection& task_set_collection);
+
+   private:
+    size_t sizes_[kNumberOfTaskSets];
+  };
+
   RasterWorkerPool();
   virtual ~RasterWorkerPool();
 
@@ -39,15 +53,8 @@ class CC_EXPORT RasterWorkerPool {
   // posts |callback| to |task_runner| when run.
   static scoped_refptr<RasterizerTask> CreateRasterFinishedTask(
       base::SequencedTaskRunner* task_runner,
-      const base::Closure& callback);
-
-  // Utility function that can be used to create a "raster required for
-  // activation finished" task that posts |callback| to |task_runner| when run.
-  static scoped_refptr<RasterizerTask>
-      CreateRasterRequiredForActivationFinishedTask(
-          size_t tasks_required_for_activation_count,
-          base::SequencedTaskRunner* task_runner,
-          const base::Closure& callback);
+      const base::Closure& callback,
+      base::debug::TraceEventSyntheticDelay* synthetic_delay);
 
   // Utility function that can be used to call ::ScheduleOnOriginThread() for
   // each task in |graph|.