cc: Generalize raster task notifications

cc/resources/pixel_buffer_raster_worker_pool.h

 // Copyright 2013 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_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 #define CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 49 matching lines @@
       bool operator()(const RasterTaskState& state) const {
         return state.task == task_;
       }
 
      private:
       const RasterTask* task_;
     };
 
     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;
 
   PixelBufferRasterWorkerPool(base::SequencedTaskRunner* task_runner,
                               TaskGraphRunner* task_graph_runner,
                               ContextProvider* context_provider,
                               ResourceProvider* resource_provider,
                               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;
   scoped_refptr<base::debug::ConvertableToTraceFormat> StateAsValue() const;
   void ThrottleStateAsValueInto(base::debug::TracedValue* throttle_state) const;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   TaskGraphRunner* task_graph_runner_;
   const NamespaceToken namespace_token_;
   RasterizerClient* client_;
   ContextProvider* context_provider_;
   ResourceProvider* resource_provider_;
 
   bool shutdown_;
 
   RasterTaskQueue raster_tasks_;
   RasterTaskState::Vector raster_task_states_;
   RasterTaskDeque raster_tasks_with_pending_upload_;
   RasterTask::Vector completed_raster_tasks_;
   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.
   TaskGraph graph_;
   Task::Vector completed_tasks_;
 
   base::WeakPtrFactory<PixelBufferRasterWorkerPool>
       raster_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_