Index: cc/test/fake_tile_manager.cc |
diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc |
index 8aa343b7b313b583b825cebc4e9fd72881ce35cd..31d3072bbf829d6ef0b80b971847dd2707534741 100644 |
--- a/cc/test/fake_tile_manager.cc |
+++ b/cc/test/fake_tile_manager.cc |
@@ -20,12 +20,24 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient { |
// Overridden from Rasterizer: |
void SetClient(RasterizerClient* client) override {} |
void Shutdown() override {} |
+ void RunTasks(RasterTaskQueue* queue) override { |
+ for (auto& item : queue->items) { |
+ RasterTask* task = item.task; |
+ |
+ task->WillSchedule(); |
+ task->ScheduleOnOriginThread(this); |
+ task->DidSchedule(); |
+ |
+ task->WillRun(); |
+ task->RunOnWorkerThread(); |
+ task->DidRun(); |
+ |
+ completed_tasks_.push_back(task); |
+ } |
+ } |
void ScheduleTasks(RasterTaskQueue* queue) override { |
- for (RasterTaskQueue::Item::Vector::const_iterator it = |
- queue->items.begin(); |
- it != queue->items.end(); |
- ++it) { |
- RasterTask* task = it->task; |
+ for (auto& item : queue->items) { |
+ RasterTask* task = item.task; |
task->WillSchedule(); |
task->ScheduleOnOriginThread(this); |
@@ -35,11 +47,7 @@ class FakeRasterizerImpl : public Rasterizer, public RasterizerTaskClient { |
} |
} |
void CheckForCompletedTasks() override { |
- for (RasterTask::Vector::iterator it = completed_tasks_.begin(); |
- it != completed_tasks_.end(); |
- ++it) { |
- RasterTask* task = it->get(); |
- |
+ for (auto& task : completed_tasks_) { |
task->WillComplete(); |
task->CompleteOnOriginThread(this); |
task->DidComplete(); |
@@ -90,7 +98,7 @@ void FakeTileManager::AssignMemoryToTiles( |
tiles_for_raster.clear(); |
SetGlobalStateForTesting(state); |
- AssignGpuMemoryToTiles(&tiles_for_raster); |
+ AssignGpuMemoryToTiles(&tiles_for_raster, std::numeric_limits<size_t>::max()); |
} |
bool FakeTileManager::HasBeenAssignedMemory(Tile* tile) { |