Move TaskGraph creation to TileManager

cc/raster/tile_task_runner.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_RASTER_TILE_TASK_RUNNER_H_
 #define CC_RASTER_TILE_TASK_RUNNER_H_
 
-#include <bitset>
 #include <vector>
 
 #include "base/callback.h"
 #include "cc/raster/task_graph_runner.h"
 #include "cc/resources/resource_format.h"
 
 namespace cc {
 class ImageDecodeTask;
 class RasterTask;
 class Resource;
@@ skipping 50 matching lines @@
   const ImageDecodeTask::Vector& dependencies() const { return dependencies_; }
 
  protected:
   explicit RasterTask(ImageDecodeTask::Vector* dependencies);
   ~RasterTask() override;
 
  private:
   ImageDecodeTask::Vector dependencies_;
 };
 
-// kNumberOfTaskSets must be greater or equal to the number of values in
-// TileManager::NamedTaskSet.
-// TODO(reveman): Use template specialization to make it easy for client code to
-// check at compile time that the number of supported task sets is correct.
-static const size_t kNumberOfTaskSets = 3;
-typedef size_t TaskSet;
-typedef std::bitset<kNumberOfTaskSets> TaskSetCollection;
-
-class CC_EXPORT TileTaskRunnerClient {
- public:
-  virtual void DidFinishRunningTileTasks(TaskSet task_set) = 0;
-
- protected:
-  virtual ~TileTaskRunnerClient() {}
-};
-
-struct CC_EXPORT TileTaskQueue {
-  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, const TaskSetCollection& task_sets);
-    ~Item();
-
-    RasterTask* task;
-    TaskSetCollection task_sets;
-  };
-
-  TileTaskQueue();
-  ~TileTaskQueue();
-
-  void Swap(TileTaskQueue* other);
-  void Reset();
-
-  Item::Vector items;
-};
-
-// This interface can be used to schedule and run tile tasks. The client will
-// be notified asynchronously when the set of tasks marked as "required for
-// activation" have finished running, when tasks marked "required for draw"
-// have finished running, and when all scheduled tasks have finished running.
+// This interface can be used to schedule and run tile tasks.
 // The client can call CheckForCompletedTasks() at any time to dispatch
 // pending completion callbacks for all tasks that have finished running.
 class CC_EXPORT TileTaskRunner {
  public:
-  // Set the client instance to be notified when finished running tasks.
-  virtual void SetClient(TileTaskRunnerClient* client) = 0;
-
   // Tells the worker pool to shutdown after canceling all previously scheduled
   // tasks. Reply callbacks are still guaranteed to run when
   // CheckForCompletedTasks() is called.
   virtual void Shutdown() = 0;
 
-  // Schedule running of tile tasks in |queue| and all dependencies.
-  // Previously scheduled tasks that are not in |queue| will be canceled unless
+  // Schedule running of tile tasks in |graph| and all dependencies.
+  // Previously scheduled tasks that are not in |graph| will be canceled unless
   // already running. Once scheduled, reply callbacks are guaranteed to run for
   // all tasks even if they later get canceled by another call to
   // ScheduleTasks().
-  virtual void ScheduleTasks(TileTaskQueue* queue) = 0;
+  virtual void ScheduleTasks(scoped_ptr<TaskGraph> graph) = 0;
 
   // Check for completed tasks and dispatch reply callbacks.
   virtual void CheckForCompletedTasks() = 0;
 
   // Returns the format to use for the tiles.
   virtual ResourceFormat GetResourceFormat(bool must_support_alpha) const = 0;
 
   // Determine if the resource requires swizzling.
   virtual bool GetResourceRequiresSwizzle(bool must_support_alpha) const = 0;
 
  protected:
   virtual ~TileTaskRunner() {}
 };
 
 }  // namespace cc
 
 #endif  // CC_RASTER_TILE_TASK_RUNNER_H_