Index: cc/raster/zero_copy_tile_task_worker_pool.cc |
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc |
index da962333e1a5fa440880ca08d5dacc876cdbb399..d860fd0faf9879fc4175e4955c6c5d8f4dd44b55 100644 |
--- a/cc/raster/zero_copy_tile_task_worker_pool.cc |
+++ b/cc/raster/zero_copy_tile_task_worker_pool.cc |
@@ -104,24 +104,14 @@ void ZeroCopyTileTaskWorkerPool::Shutdown() { |
void ZeroCopyTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) { |
TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::ScheduleTasks"); |
- ScheduleTasksOnOriginThread(this, graph); |
task_graph_runner_->ScheduleTasks(namespace_token_, graph); |
} |
-void ZeroCopyTileTaskWorkerPool::CheckForCompletedTasks() { |
+void ZeroCopyTileTaskWorkerPool::CollectCompletedTasks( |
+ Task::Vector* completed_tasks) { |
TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::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 ZeroCopyTileTaskWorkerPool::GetResourceFormat( |
@@ -140,6 +130,10 @@ bool ZeroCopyTileTaskWorkerPool::GetResourceRequiresSwizzle( |
return ResourceFormatRequiresSwizzle(GetResourceFormat(must_support_alpha)); |
} |
+TileTaskClient* ZeroCopyTileTaskWorkerPool::AsTileTaskClient() { |
+ return this; |
+} |
+ |
scoped_ptr<RasterBuffer> ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster( |
const Resource* resource, |
uint64_t resource_content_id, |