| Index: cc/test/fake_tile_manager.cc
|
| diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
|
| index 1d6ecd81ccb241c7546aad2bcab0e772abeedef7..cba9db4b5c7ee5116116dd3fa0cd93d39abc6632 100644
|
| --- a/cc/test/fake_tile_manager.cc
|
| +++ b/cc/test/fake_tile_manager.cc
|
| @@ -13,17 +13,9 @@ 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 {
|
| @@ -36,9 +28,6 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
|
| }
|
| }
|
| virtual void CheckForCompletedTasks() OVERRIDE {
|
| - internal::Task::Vector completed_tasks;
|
| - CollectCompletedWorkerPoolTasks(&completed_tasks);
|
| -
|
| while (!completed_tasks_.empty()) {
|
| internal::WorkerPoolTask* task = completed_tasks_.front().get();
|
|
|
| @@ -80,6 +69,8 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
|
| 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,
|
| @@ -89,6 +80,8 @@ 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,
|
| @@ -99,6 +92,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| 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,
|
| @@ -109,6 +104,8 @@ FakeTileManager::FakeTileManager(TileManagerClient* client,
|
| 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,
|
| @@ -132,10 +129,6 @@ bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) {
|
| tile) != tiles_for_raster.end();
|
| }
|
|
|
| -void FakeTileManager::CheckForCompletedTasks() {
|
| - RasterWorkerPoolForTesting()->CheckForCompletedTasks();
|
| -}
|
| -
|
| void FakeTileManager::DidFinishRunningTasksForTesting() {
|
| DidFinishRunningTasks();
|
| }
|
|
|