| Index: cc/raster/one_copy_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| index 79429ad36a2cf8001302f2cb032e4e4a73ad24f9..d33be114786abdd7ff77b47926c4af6f8f131bf5 100644
|
| --- a/cc/raster/one_copy_tile_task_worker_pool.cc
|
| +++ b/cc/raster/one_copy_tile_task_worker_pool.cc
|
| @@ -256,8 +256,6 @@ void OneCopyTileTaskWorkerPool::Shutdown() {
|
| void OneCopyTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
|
| TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::ScheduleTasks");
|
|
|
| - ScheduleTasksOnOriginThread(this, graph);
|
| -
|
| // Barrier to sync any new resources to the worker context.
|
| resource_provider_->output_surface()
|
| ->context_provider()
|
| @@ -267,21 +265,11 @@ void OneCopyTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
|
| task_graph_runner_->ScheduleTasks(namespace_token_, graph);
|
| }
|
|
|
| -void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() {
|
| +void OneCopyTileTaskWorkerPool::CollectCompletedTasks(
|
| + Task::Vector* completed_tasks) {
|
| TRACE_EVENT0("cc", "OneCopyTileTaskWorkerPool::CheckForCompletedTasks");
|
|
|
| - task_graph_runner_->CollectCompletedTasks(namespace_token_,
|
| - &completed_tasks_);
|
| -
|
| - for (Task::Vector::const_iterator it = completed_tasks_.begin();
|
| - it != completed_tasks_.end(); ++it) {
|
| - TileTask* task = static_cast<TileTask*>(it->get());
|
| -
|
| - task->WillComplete();
|
| - task->CompleteOnOriginThread(this);
|
| - task->DidComplete();
|
| - }
|
| - completed_tasks_.clear();
|
| + task_graph_runner_->CollectCompletedTasks(namespace_token_, completed_tasks);
|
| }
|
|
|
| ResourceFormat OneCopyTileTaskWorkerPool::GetResourceFormat(
|
| @@ -300,6 +288,10 @@ bool OneCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
|
| return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha));
|
| }
|
|
|
| +TileTaskClient* OneCopyTileTaskWorkerPool::AsTileTaskClient() {
|
| + return this;
|
| +}
|
| +
|
| scoped_ptr<RasterBuffer> OneCopyTileTaskWorkerPool::AcquireBufferForRaster(
|
| const Resource* resource,
|
| uint64_t resource_content_id,
|
|
|