cc: Generalize raster task notifications

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index 89a5ad3276e73f2cab2bcb65d57e183ed98158f9..117abd459602375ae8eca093a1a6874d1161ed60 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -87,6 +87,12 @@ scoped_refptr<base::debug::ConvertableToTraceFormat>
 class CC_EXPORT TileManager : public RasterizerClient,
                               public RefCountedManager<Tile> {
  public:
+  enum NamedTaskSet {
+    REQUIRED_FOR_ACTIVATION = 0,
+    HIGH_RESOLUTION_IN_NOW_BIN_ON_ACTIVE_TREE = 1,
+    // Adding additional values required increasing kMaxTaskSet in rasterizer.h
+  };
+
   static scoped_ptr<TileManager> Create(
       TileManagerClient* client,
       base::SequencedTaskRunner* task_runner,
@@ -175,9 +181,11 @@ class CC_EXPORT TileManager : public RasterizerClient,
   virtual void Release(Tile* tile) OVERRIDE;
 
   // Overriden from RasterizerClient:
-  virtual bool ShouldForceTasksRequiredForActivationToComplete() const OVERRIDE;
   virtual void DidFinishRunningTasks() OVERRIDE;
-  virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE;
+  virtual void DidFinishRunningTaskSet(TaskSet task_set) OVERRIDE;
+  virtual bool ShouldForceTaskSetToComplete(TaskSet task_set) const OVERRIDE;
+  virtual base::debug::TraceEventSyntheticDelay* SyntheticDelayForTaskSet(
+      TaskSet task_set) const OVERRIDE;
 
   typedef std::vector<Tile*> TileVector;
   typedef std::set<Tile*> TileSet;
@@ -264,6 +272,9 @@ class CC_EXPORT TileManager : public RasterizerClient,
 
   UniqueNotifier ready_to_activate_check_notifier_;
 
+  base::debug::TraceEventSyntheticDelay*
+      raster_required_for_activation_synthetic_delay_;
+
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };