cc: Generalize raster task notifications

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 61c8e553e15e0ebe35da23386f39b8b3be639d63..bc046ce971c4ac31615ed4ccaa7325e37472d539 100644
--- a/cc/resources/gpu_raster_worker_pool.h
+++ b/cc/resources/gpu_raster_worker_pool.h
@@ -5,6 +5,8 @@
 #ifndef CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_GPU_RASTER_WORKER_POOL_H_
 
+#include <vector>
+
 #include "base/memory/weak_ptr.h"
 #include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/rasterizer.h"
@@ -43,7 +45,7 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
                       ResourceProvider* resource_provider);
 
   void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterTaskSetFinished(TaskSet task_set);
   void ScheduleRunTasksOnOriginThread();
   void RunTasksOnOriginThread();
   void RunTaskOnOriginThread(RasterizerTask* task);
@@ -58,12 +60,12 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
   bool run_tasks_on_origin_thread_pending_;
 
   bool raster_tasks_pending_;
-  bool raster_tasks_required_for_activation_pending_;
+  RasterTaskQueue::Item::TaskSetCollection raster_task_sets_pending_;
 
   base::WeakPtrFactory<GpuRasterWorkerPool> raster_finished_weak_ptr_factory_;
 
   scoped_refptr<RasterizerTask> raster_finished_task_;
-  scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_;
+  std::vector<scoped_refptr<RasterizerTask> > task_set_finished_tasks_;

[reveman, 2014/09/05 08:38:59]

I think you can just use an array here instead.

[ernstm, 2014/09/05 21:36:10]

Done.

 
   // Task graph used when scheduling tasks and vector used to gather
   // completed tasks.