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..a76a4437a853db6c1dce1d5d47c41b49f6d745ea 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"
@@ -49,8 +51,7 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool,
                         ResourceProvider* resource_provider);
 
  private:
-  void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterTaskSetFinished(TaskSet task_set);
   scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
@@ -59,11 +60,9 @@ class CC_EXPORT ImageRasterWorkerPool : public RasterWorkerPool,
   RasterizerClient* client_;
   ResourceProvider* resource_provider_;
 
-  bool raster_tasks_pending_;
-  bool raster_tasks_required_for_activation_pending_;
+  TaskSetCollection raster_task_sets_pending_;
 
-  scoped_refptr<RasterizerTask> raster_finished_task_;
-  scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_;
+  scoped_refptr<RasterizerTask> task_set_finished_tasks_[kNumberOfTaskSets];
 
   // Task graph used when scheduling tasks and vector used to gather
   // completed tasks.