cc: Move GPU raster to DirectRasterWorkerPool.

cc/test/fake_tile_manager.cc

 // Copyright 2012 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.
 
 #include "cc/test/fake_tile_manager.h"
 
 #include <deque>
 #include <limits>
 
 #include "cc/resources/raster_worker_pool.h"
 
 namespace cc {
 
 namespace {
 
-class FakeTaskGraphRunner : public internal::TaskGraphRunner {
- public:
-  FakeTaskGraphRunner() : internal::TaskGraphRunner(0, "CompositorRaster") {}
-};
-base::LazyInstance<FakeTaskGraphRunner> g_task_graph_runner =
-    LAZY_INSTANCE_INITIALIZER;
-
 class FakeRasterWorkerPool : public RasterWorkerPool {
  public:
-  FakeRasterWorkerPool()
-      : RasterWorkerPool(g_task_graph_runner.Pointer(), NULL, NULL) {}
+  FakeRasterWorkerPool() : RasterWorkerPool(NULL, NULL) {}
 
   // Overridden from RasterWorkerPool:
-  virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE {
+  virtual void ScheduleTasks(RasterTaskQueue* queue) OVERRIDE {
     for (RasterTaskQueueIterator it(queue); it; ++it) {
       internal::RasterWorkerPoolTask* task = *it;
 
       task->DidSchedule();
 
       completed_tasks_.push_back(task);
     }
   }
   virtual void CheckForCompletedTasks() OVERRIDE {
-    internal::Task::Vector completed_tasks;
-    CollectCompletedWorkerPoolTasks(&completed_tasks);
-
     while (!completed_tasks_.empty()) {
       internal::WorkerPoolTask* task = completed_tasks_.front().get();
 
       task->WillComplete();
       task->DidComplete();
       task->RunReplyOnOriginThread();
 
       completed_tasks_.pop_front();
     }
   }
@@ skipping 21 matching lines @@
   virtual void OnRasterTasksRequiredForActivationFinished() OVERRIDE {}
 
   TaskDeque completed_tasks_;
 };
 
 }  // namespace
 
 FakeTileManager::FakeTileManager(TileManagerClient* client)
     : TileManager(client,
                   NULL,
+                  NULL,
+                  make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   std::numeric_limits<unsigned>::max(),
                   NULL,
                   true) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider)
     : TileManager(client,
                   resource_provider,
+                  NULL,
+                  make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   std::numeric_limits<unsigned>::max(),
                   NULL,
                   true) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider,
                                  bool allow_on_demand_raster)
     : TileManager(client,
                   resource_provider,
+                  NULL,
+                  make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   std::numeric_limits<unsigned>::max(),
                   NULL,
                   allow_on_demand_raster) {}
 
 FakeTileManager::FakeTileManager(TileManagerClient* client,
                                  ResourceProvider* resource_provider,
                                  size_t raster_task_limit_bytes)
     : TileManager(client,
                   resource_provider,
+                  NULL,
+                  make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   make_scoped_ptr<RasterWorkerPool>(new FakeRasterWorkerPool),
                   raster_task_limit_bytes,
                   NULL,
                   true) {}
 
 FakeTileManager::~FakeTileManager() {}
 
 void FakeTileManager::AssignMemoryToTiles(
     const GlobalStateThatImpactsTilePriority& state) {
   tiles_for_raster.clear();
   all_tiles.Clear();
 
   SetGlobalStateForTesting(state);
   GetTilesWithAssignedBins(&all_tiles);
   AssignGpuMemoryToTiles(&all_tiles, &tiles_for_raster);
 }
 
 bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
   return std::find(tiles_for_raster.begin(),
                    tiles_for_raster.end(),
                    tile) != tiles_for_raster.end();
 }
 
-void FakeTileManager::CheckForCompletedTasks() {
-  RasterWorkerPoolForTesting()->CheckForCompletedTasks();
-}
-
 void FakeTileManager::DidFinishRunningTasksForTesting() {
   DidFinishRunningTasks();
 }
 
 void FakeTileManager::Release(Tile* tile) {
   TileManager::Release(tile);
   CleanUpReleasedTiles();
 }
 
 }  // namespace cc