cc: Generalize raster task notifications

cc/resources/rasterizer.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_RASTERIZER_H_
 #define CC_RESOURCES_RASTERIZER_H_
 
+#include <bitset>
 #include <vector>
 
 #include "base/callback.h"
 #include "cc/resources/resource_format.h"
 #include "cc/resources/task_graph_runner.h"
 
+namespace base {
+namespace debug {
+class TraceEventSyntheticDelay;
+}
+}
+
 namespace cc {
 class ImageDecodeTask;
 class RasterTask;
 class Resource;
 class RasterBuffer;
 
 class CC_EXPORT RasterizerTaskClient {
  public:
   virtual RasterBuffer* AcquireBufferForRaster(RasterTask* task) = 0;
   virtual void ReleaseBufferForRaster(RasterTask* task) = 0;
@@ skipping 54 matching lines @@
 
  protected:
   RasterTask(const Resource* resource, ImageDecodeTask::Vector* dependencies);
   virtual ~RasterTask();
 
  private:
   const Resource* resource_;
   ImageDecodeTask::Vector dependencies_;
 };
 
+static const size_t kNumberOfTaskSets = 3;
+typedef size_t TaskSet;
+typedef std::bitset<kNumberOfTaskSets> TaskSetCollection;
+
 class CC_EXPORT RasterizerClient {
  public:
-  virtual bool ShouldForceTasksRequiredForActivationToComplete() const = 0;
-  virtual void DidFinishRunningTasks() = 0;
-  virtual void DidFinishRunningTasksRequiredForActivation() = 0;
+  virtual void DidFinishRunningTaskSet(TaskSet task_set) = 0;

[ernstm, 2014/09/10 18:26:19]

I also renamed this to DidFinishRunningTasks(TaskSet task_set) to be consistent
with the other naming changes.

+  virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const = 0;
+  virtual base::debug::TraceEventSyntheticDelay* SyntheticDelayForTaskSet(

[ernstm, 2014/09/10 18:26:19]

and renamed this to SyntheticDelayForTasks(TaskSet task_set)

+      TaskSet task_set) const = 0;
 
  protected:
   virtual ~RasterizerClient() {}
 };
 
 struct CC_EXPORT RasterTaskQueue {
   struct CC_EXPORT Item {
     class TaskComparator {
      public:
       explicit TaskComparator(const RasterTask* task) : task_(task) {}
 
       bool operator()(const Item& item) const { return item.task == task_; }
 
      private:
       const RasterTask* task_;
     };
 
     typedef std::vector<Item> Vector;
 
-    Item(RasterTask* task, bool required_for_activation);
+    Item(RasterTask* task, const TaskSetCollection& task_sets);
     ~Item();
 
-    static bool IsRequiredForActivation(const Item& item) {
-      return item.required_for_activation;
-    }
-
     RasterTask* task;
-    bool required_for_activation;
+    TaskSetCollection task_sets;
   };
 
   RasterTaskQueue();
   ~RasterTaskQueue();
 
   void Swap(RasterTaskQueue* other);
   void Reset();
 
   Item::Vector items;
-  size_t required_for_activation_count;
 };
 
 // This interface can be used to schedule and run raster tasks. The client will
 // be notified asynchronously when the set of tasks marked as "required for
 // activation" have finished running and when all scheduled tasks have finished
 // running. The client can call CheckForCompletedTasks() at any time to dispatch
 // pending completion callbacks for all tasks that have finished running.
 class CC_EXPORT Rasterizer {
  public:
   // Set the client instance to be notified when finished running tasks.
@@ skipping 14 matching lines @@
   // Check for completed tasks and dispatch reply callbacks.
   virtual void CheckForCompletedTasks() = 0;
 
  protected:
   virtual ~Rasterizer() {}
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RASTERIZER_H_