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..a74e5b8e89a174b4dec77ab7372c04b6724fb498 100644
--- a/cc/resources/gpu_raster_worker_pool.h
+++ b/cc/resources/gpu_raster_worker_pool.h
@@ -42,8 +42,7 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
                       ContextProvider* context_provider,
                       ResourceProvider* resource_provider);
 
-  void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterFinished(TaskSet task_set);
   void ScheduleRunTasksOnOriginThread();
   void RunTasksOnOriginThread();
   void RunTaskOnOriginThread(RasterizerTask* task);
@@ -57,13 +56,11 @@ class CC_EXPORT GpuRasterWorkerPool : public RasterWorkerPool,
 
   bool run_tasks_on_origin_thread_pending_;
 
-  bool raster_tasks_pending_;
-  bool raster_tasks_required_for_activation_pending_;
+  TaskSetCollection raster_pending_;
 
   base::WeakPtrFactory<GpuRasterWorkerPool> raster_finished_weak_ptr_factory_;
 
-  scoped_refptr<RasterizerTask> raster_finished_task_;
-  scoped_refptr<RasterizerTask> raster_required_for_activation_finished_task_;
+  scoped_refptr<RasterizerTask> raster_finished_tasks_[kNumberOfTaskSets];
 
   // Task graph used when scheduling tasks and vector used to gather
   // completed tasks.