| Index: cc/output/direct_renderer.cc
|
| diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc
|
| index 08fe2571d3975654812554a20f120fa3223add85..a4d58b40553603e462bf415bd47c07cf465f2345 100644
|
| --- a/cc/output/direct_renderer.cc
|
| +++ b/cc/output/direct_renderer.cc
|
| @@ -416,30 +416,7 @@ bool DirectRenderer::UseRenderPass(DrawingFrame* frame,
|
| }
|
|
|
| void DirectRenderer::RunOnDemandRasterTask(Task* on_demand_raster_task) {
|
| - TaskGraphRunner* task_graph_runner = RasterWorkerPool::GetTaskGraphRunner();
|
| - DCHECK(task_graph_runner);
|
| -
|
| - // Make sure we have a unique task namespace token.
|
| - if (!on_demand_task_namespace_.IsValid())
|
| - on_demand_task_namespace_ = task_graph_runner->GetNamespaceToken();
|
| -
|
| - // Construct a task graph that contains this single raster task.
|
| - TaskGraph graph;
|
| - graph.nodes.push_back(
|
| - TaskGraph::Node(on_demand_raster_task,
|
| - RasterWorkerPool::kOnDemandRasterTaskPriority,
|
| - 0u));
|
| -
|
| - // Schedule task and wait for task graph runner to finish running it.
|
| - task_graph_runner->ScheduleTasks(on_demand_task_namespace_, &graph);
|
| - task_graph_runner->WaitForTasksToFinishRunning(on_demand_task_namespace_);
|
| -
|
| - // Collect task now that it has finished running.
|
| - Task::Vector completed_tasks;
|
| - task_graph_runner->CollectCompletedTasks(on_demand_task_namespace_,
|
| - &completed_tasks);
|
| - DCHECK_EQ(1u, completed_tasks.size());
|
| - DCHECK_EQ(completed_tasks[0], on_demand_raster_task);
|
| + client_->RunOnDemandRasterTask(on_demand_raster_task);
|
| }
|
|
|
| bool DirectRenderer::HasAllocatedResourcesForTesting(RenderPass::Id id)
|
|
|