cc: Generalize raster task notifications

cc/resources/image_raster_worker_pool.h

Index: cc/resources/image_raster_worker_pool.h
diff --git a/cc/resources/image_raster_worker_pool.h b/cc/resources/image_raster_worker_pool.h
index ca0bbc26a1e867a419047809da286e355318fe2d..83f43cb504acf6735207498675d14e911b666511 100644
--- a/cc/resources/image_raster_worker_pool.h
+++ b/cc/resources/image_raster_worker_pool.h
@@ -5,6 +5,8 @@
 #ifndef CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_IMAGE_RASTER_WORKER_POOL_H_
 
+#include <vector>
+
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "cc/resources/raster_worker_pool.h"
@@ -50,7 +52,7 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool,
 
  private:
   void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterTaskSetFinished(TaskSet task_set);
   scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
@@ -60,10 +62,10 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool,
   ResourceProvider* resource_provider_;
 
   bool raster_tasks_pending_;
-  bool raster_tasks_required_for_activation_pending_;
+  RasterTaskQueue::Item::TaskSetCollection raster_task_sets_pending_;
 
   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]

array

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

Done.

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