cc: Generalize raster task notifications

cc/resources/pixel_buffer_raster_worker_pool.h

Index: cc/resources/pixel_buffer_raster_worker_pool.h
diff --git a/cc/resources/pixel_buffer_raster_worker_pool.h b/cc/resources/pixel_buffer_raster_worker_pool.h
index a251c302c7a140fe6f52f6377856a09ef01968ab..bfad11c6ec7227d71ce4bb0569b047ae1043458e 100644
--- a/cc/resources/pixel_buffer_raster_worker_pool.h
+++ b/cc/resources/pixel_buffer_raster_worker_pool.h
@@ -67,14 +67,12 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool,
 
     typedef std::vector<RasterTaskState> Vector;
 
-    RasterTaskState(RasterTask* task, bool required_for_activation)
-        : type(UNSCHEDULED),
-          task(task),
-          required_for_activation(required_for_activation) {}
+    RasterTaskState(RasterTask* task,
+                    const RasterTaskQueue::Item::TaskSetCollection& task_sets);
 
     enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type;
     RasterTask* task;
-    bool required_for_activation;
+    RasterTaskQueue::Item::TaskSetCollection task_sets;
   };
 
   typedef std::deque<scoped_refptr<RasterTask> > RasterTaskDeque;
@@ -86,14 +84,14 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool,
                               size_t max_transfer_buffer_usage_bytes);
 
   void OnRasterFinished();
-  void OnRasterRequiredForActivationFinished();
+  void OnRasterTaskSetFinished(TaskSet task_set);
   void FlushUploads();
   void CheckForCompletedUploads();
   void CheckForCompletedRasterTasks();
   void ScheduleMoreTasks();
   unsigned PendingRasterTaskCount() const;
   bool HasPendingTasks() const;
-  bool HasPendingTasksRequiredForActivation() const;
+  RasterTaskQueue::Item::TaskSetCollection HasPendingTasksInSets() const;
   void CheckForCompletedRasterizerTasks();
 
   const char* StateName() const;
@@ -116,20 +114,22 @@ class CC_EXPORT PixelBufferRasterWorkerPool : public RasterWorkerPool,
   RasterizerTask::Vector completed_image_decode_tasks_;
 
   size_t scheduled_raster_task_count_;
-  size_t raster_tasks_required_for_activation_count_;
+  RasterTaskQueue::TaskSetSizes task_set_sizes_;
+  RasterTaskQueue::TaskSetSizes raster_tasks_with_pending_upload_sizes_;
   size_t bytes_pending_upload_;
   size_t max_bytes_pending_upload_;
   bool has_performed_uploads_since_last_flush_;
 
   bool should_notify_client_if_no_tasks_are_pending_;
-  bool should_notify_client_if_no_tasks_required_for_activation_are_pending_;
+  RasterTaskQueue::Item::TaskSetCollection
+      should_notify_client_if_no_tasks_in_set_are_pending_;
   bool raster_finished_task_pending_;
-  bool raster_required_for_activation_finished_task_pending_;
+  RasterTaskQueue::Item::TaskSetCollection task_set_finished_tasks_pending_;
 
   DelayedUniqueNotifier check_for_completed_raster_task_notifier_;
 
   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:11]

Done.

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