| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/resources/zero_copy_tile_task_worker_pool.h" | 5 #include "cc/resources/zero_copy_tile_task_worker_pool.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 126 |
| 127 graph_.edges.push_back( | 127 graph_.edges.push_back( |
| 128 TaskGraph::Edge(task, new_task_set_finished_tasks[task_set].get())); | 128 TaskGraph::Edge(task, new_task_set_finished_tasks[task_set].get())); |
| 129 } | 129 } |
| 130 | 130 |
| 131 InsertNodesForRasterTask(&graph_, task, task->dependencies(), priority++); | 131 InsertNodesForRasterTask(&graph_, task, task->dependencies(), priority++); |
| 132 } | 132 } |
| 133 | 133 |
| 134 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) { | 134 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) { |
| 135 InsertNodeForTask(&graph_, new_task_set_finished_tasks[task_set].get(), | 135 InsertNodeForTask(&graph_, new_task_set_finished_tasks[task_set].get(), |
| 136 kTaskSetFinishedTaskPriority, task_count[task_set]); | 136 kTaskSetFinishedTaskPriorityBase + task_set, |
| 137 task_count[task_set]); |
| 137 } | 138 } |
| 138 | 139 |
| 139 ScheduleTasksOnOriginThread(this, &graph_); | 140 ScheduleTasksOnOriginThread(this, &graph_); |
| 140 task_graph_runner_->ScheduleTasks(namespace_token_, &graph_); | 141 task_graph_runner_->ScheduleTasks(namespace_token_, &graph_); |
| 141 | 142 |
| 142 std::copy(new_task_set_finished_tasks, | 143 std::copy(new_task_set_finished_tasks, |
| 143 new_task_set_finished_tasks + kNumberOfTaskSets, | 144 new_task_set_finished_tasks + kNumberOfTaskSets, |
| 144 task_set_finished_tasks_); | 145 task_set_finished_tasks_); |
| 145 | 146 |
| 146 TRACE_EVENT_ASYNC_STEP_INTO1("cc", "ScheduledTasks", this, "running", "state", | 147 TRACE_EVENT_ASYNC_STEP_INTO1("cc", "ScheduledTasks", this, "running", "state", |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 new base::debug::TracedValue(); | 202 new base::debug::TracedValue(); |
| 202 | 203 |
| 203 state->BeginArray("tasks_pending"); | 204 state->BeginArray("tasks_pending"); |
| 204 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) | 205 for (TaskSet task_set = 0; task_set < kNumberOfTaskSets; ++task_set) |
| 205 state->AppendBoolean(tasks_pending_[task_set]); | 206 state->AppendBoolean(tasks_pending_[task_set]); |
| 206 state->EndArray(); | 207 state->EndArray(); |
| 207 return state; | 208 return state; |
| 208 } | 209 } |
| 209 | 210 |
| 210 } // namespace cc | 211 } // namespace cc |
| OLD | NEW |