| Index: cc/raster/gpu_tile_task_worker_pool.cc
|
| diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
|
| index 27d0a4651559e8a5d2402a09aaa422e9824924ca..94f6b6fcae4bc0cd09bc44486f8340172597bc16 100644
|
| --- a/cc/raster/gpu_tile_task_worker_pool.cc
|
| +++ b/cc/raster/gpu_tile_task_worker_pool.cc
|
| @@ -117,7 +117,6 @@ GpuTileTaskWorkerPool::GpuTileTaskWorkerPool(
|
| gpu_rasterization_msaa_sample_count)) {}
|
|
|
| GpuTileTaskWorkerPool::~GpuTileTaskWorkerPool() {
|
| - DCHECK_EQ(0u, completed_tasks_.size());
|
| }
|
|
|
| TileTaskRunner* GpuTileTaskWorkerPool::AsTileTaskRunner() {
|
| @@ -135,8 +134,6 @@ void GpuTileTaskWorkerPool::Shutdown() {
|
| void GpuTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
|
| TRACE_EVENT0("cc", "GpuTileTaskWorkerPool::ScheduleTasks");
|
|
|
| - ScheduleTasksOnOriginThread(this, graph);
|
| -
|
| // Barrier to sync any new resources to the worker context.
|
| rasterizer_->resource_provider()
|
| ->output_surface()
|
| @@ -147,13 +144,11 @@ void GpuTileTaskWorkerPool::ScheduleTasks(TaskGraph* graph) {
|
| task_graph_runner_->ScheduleTasks(namespace_token_, graph);
|
| }
|
|
|
| -void GpuTileTaskWorkerPool::CheckForCompletedTasks() {
|
| +void GpuTileTaskWorkerPool::CollectCompletedTasks(
|
| + Task::Vector* completed_tasks) {
|
| TRACE_EVENT0("cc", "GpuTileTaskWorkerPool::CheckForCompletedTasks");
|
|
|
| - task_graph_runner_->CollectCompletedTasks(namespace_token_,
|
| - &completed_tasks_);
|
| - CompleteTasks(completed_tasks_);
|
| - completed_tasks_.clear();
|
| + task_graph_runner_->CollectCompletedTasks(namespace_token_, completed_tasks);
|
| }
|
|
|
| ResourceFormat GpuTileTaskWorkerPool::GetResourceFormat(
|
| @@ -167,15 +162,8 @@ bool GpuTileTaskWorkerPool::GetResourceRequiresSwizzle(
|
| return false;
|
| }
|
|
|
| -void GpuTileTaskWorkerPool::CompleteTasks(const Task::Vector& tasks) {
|
| - for (auto& task : tasks) {
|
| - TileTask* tile_task = static_cast<TileTask*>(task.get());
|
| -
|
| - tile_task->WillComplete();
|
| - tile_task->CompleteOnOriginThread(this);
|
| - tile_task->DidComplete();
|
| - }
|
| - completed_tasks_.clear();
|
| +TileTaskClient* GpuTileTaskWorkerPool::AsTileTaskClient() {
|
| + return this;
|
| }
|
|
|
| scoped_ptr<RasterBuffer> GpuTileTaskWorkerPool::AcquireBufferForRaster(
|
|
|