| Index: cc/test/fake_tile_task_manager.cc
|
| diff --git a/cc/test/fake_tile_task_manager.cc b/cc/test/fake_tile_task_manager.cc
|
| index 9b28d55067754e971f6854c7ab393f2246a2bf90..6a90e7a6247deb5d2c91adc39bf5adccd6225e9b 100644
|
| --- a/cc/test/fake_tile_task_manager.cc
|
| +++ b/cc/test/fake_tile_task_manager.cc
|
| @@ -16,29 +16,26 @@ FakeTileTaskManagerImpl::FakeTileTaskManagerImpl(
|
| std::unique_ptr<RasterBufferProvider> raster_buffer_provider)
|
| : raster_buffer_provider_(std::move(raster_buffer_provider)) {}
|
|
|
| -FakeTileTaskManagerImpl::~FakeTileTaskManagerImpl() {}
|
| +FakeTileTaskManagerImpl::~FakeTileTaskManagerImpl() {
|
| + DCHECK_EQ(0u, completed_tasks_.size());
|
| +}
|
|
|
| void FakeTileTaskManagerImpl::ScheduleTasks(TaskGraph* graph) {
|
| for (const auto& node : graph->nodes) {
|
| TileTask* task = static_cast<TileTask*>(node.task);
|
| -
|
| - task->WillSchedule();
|
| - task->ScheduleOnOriginThread(raster_buffer_provider_.get());
|
| - task->DidSchedule();
|
| -
|
| + // Cancel the task and append to |completed_tasks_|.
|
| + task->state().DidCancel();
|
| completed_tasks_.push_back(task);
|
| }
|
| }
|
|
|
| void FakeTileTaskManagerImpl::CheckForCompletedTasks() {
|
| - for (Task::Vector::iterator it = completed_tasks_.begin();
|
| - it != completed_tasks_.end(); ++it) {
|
| - TileTask* task = static_cast<TileTask*>(it->get());
|
| -
|
| - task->WillComplete();
|
| - task->CompleteOnOriginThread(raster_buffer_provider_.get());
|
| - task->DidComplete();
|
| + for (auto task : completed_tasks_) {
|
| + DCHECK(task->state().IsFinished() || task->state().IsCanceled());
|
| + TileTask* tile_task = static_cast<TileTask*>(task.get());
|
| + tile_task->OnTaskCompleted();
|
| }
|
| +
|
| completed_tasks_.clear();
|
| }
|
|
|
|
|