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 TaskSetCollection& task_sets);
 
     enum { UNSCHEDULED, SCHEDULED, UPLOADING, COMPLETED } type;
     RasterTask* task;
-    bool required_for_activation;
+    TaskSetCollection task_sets;
+  };
+
+  class TaskSetSizes {
+   public:
+    TaskSetSizes();
+
+    TaskSetCollection ToTaskSetCollection() const;
+    size_t& operator[](TaskSet task_set);
+    const size_t& operator[](TaskSet task_set) const;
+    bool operator==(const TaskSetSizes& other) const;
+    void operator+=(const TaskSetCollection& task_set_collection);

[reveman, 2014/09/16 22:49:05]

nit: s/task_set_collection/task_sets/

[ernstm, 2014/09/17 19:57:15]

Done.

+    void operator-=(const TaskSetCollection& task_set_collection);

[reveman, 2014/09/16 22:49:05]

nit: s/task_set_collection/task_sets/

[ernstm, 2014/09/17 19:57:15]

Done.

+
+   private:
+    size_t sizes_[kNumberOfTaskSets];
   };

[reveman, 2014/09/16 22:49:05]

I failed to think of this before but a number of explicit static utility
functions that operate on "size_t task_counts[kNumberOfTaskSets]" would likely
make the code easier to read and that might also allow you to hide all this in
the .cc file. ie.

void AddTaskSetsToTaskCounts(
    size_t *task_counts, const TaskSetCollection& tasks_sets);

[ernstm, 2014/09/17 19:57:15]

Done.

 
   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 OnRasterFinished(TaskSet task_set);
   void FlushUploads();
   void CheckForCompletedUploads();
   void CheckForCompletedRasterTasks();
   void ScheduleMoreTasks();
   unsigned PendingRasterTaskCount() const;
-  bool HasPendingTasks() const;
-  bool HasPendingTasksRequiredForActivation() const;
+  TaskSetCollection HasPendingTasks() const;

[reveman, 2014/09/16 22:49:05]

Something awkward about a function named "HasPendingTasks" returning a
TaskSetCollection. I think your options are:

bool HasPendingTasks(TaskSet task_set),
bool HasPendingTasks(const TaskSetCollection& task_sets) or
TaskSetCollection PendingTasks()

I prefer one of the HasPendingTasks versions if possible.

[ernstm, 2014/09/17 19:57:15]

Done. "TaskSetCollection PendingTasks()" works best, because it doesn't require
iterating over the task sets in the call sites (we can use the bitset
operations).

   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_;
+  TaskSetSizes task_set_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_;
-  bool raster_finished_task_pending_;
-  bool raster_required_for_activation_finished_task_pending_;
+  TaskSetCollection should_notify_client_if_no_tasks_are_pending_;
+  TaskSetCollection raster_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_;
+  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<PixelBufferRasterWorkerPool>
       raster_finished_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PixelBufferRasterWorkerPool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PIXEL_BUFFER_RASTER_WORKER_POOL_H_