cc: Generalize raster task notifications

cc/resources/image_copy_raster_worker_pool.h

Index: cc/resources/image_copy_raster_worker_pool.h
diff --git a/cc/resources/image_copy_raster_worker_pool.h b/cc/resources/image_copy_raster_worker_pool.h
index faa3f1aa7dff4490100a69c753edca0ce7998c33..1dd68ed684642a0a3a0644ee7c4548d19ab11ab2 100644
--- a/cc/resources/image_copy_raster_worker_pool.h
+++ b/cc/resources/image_copy_raster_worker_pool.h
@@ -81,8 +81,7 @@ class CC_EXPORT ImageCopyRasterWorkerPool : public RasterWorkerPool,
     ScopedResource* resource;
   };
 
-  void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterTaskSetFinished(TaskSet task_set);
   void FlushCopies();
   scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
   void StagingStateAsValueInto(base::debug::TracedValue* staging_state) const;
@@ -99,11 +98,9 @@ class CC_EXPORT ImageCopyRasterWorkerPool : public RasterWorkerPool,
 
   bool has_performed_copy_since_last_flush_;
 
-  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.