cc: Generalize raster task notifications

cc/resources/image_copy_raster_worker_pool.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_IMAGE_COPY_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_IMAGE_COPY_RASTER_WORKER_POOL_H_
 
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 63 matching lines @@
 
     typedef std::vector<RasterTaskState> Vector;
 
     RasterTaskState(const RasterTask* task, ScopedResource* resource)
         : task(task), resource(resource) {}
 
     const RasterTask* task;
     ScopedResource* resource;
   };
 
-  void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterFinished(TaskSet task_set);
   void FlushCopies();
   scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
   void StagingStateAsValueInto(base::debug::TracedValue* staging_state) const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   TaskGraphRunner* task_graph_runner_;
   const NamespaceToken namespace_token_;
   RasterizerClient* client_;
   ContextProvider* context_provider_;
   ResourceProvider* resource_provider_;
   ResourcePool* resource_pool_;
 
   RasterTaskState::Vector raster_task_states_;
 
   bool has_performed_copy_since_last_flush_;
 
-  bool raster_tasks_pending_;
-  bool raster_tasks_required_for_activation_pending_;
+  TaskSetCollection raster_pending_;
 
-  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.
   TaskGraph graph_;
   Task::Vector completed_tasks_;
 
   base::WeakPtrFactory<ImageCopyRasterWorkerPool>
       raster_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageCopyRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_IMAGE_COPY_RASTER_WORKER_POOL_H_