Chromium Code Reviews| Index: third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc |
| diff --git a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc |
| index 7def64ac93093b72ead7c15b75b697fc0de71f4e..d14336071e2a5aa4110e852d4cc281871a16acb4 100644 |
| --- a/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc |
| +++ b/third_party/WebKit/Source/platform/scheduler/base/task_queue_manager.cc |
| @@ -320,7 +320,8 @@ TaskQueueManager::ProcessTaskResult TaskQueueManager::ProcessTaskFromWorkQueue( |
| // TODO(skyostil): Figure out a way to not forget which task queue the |
| // task is associated with. See http://crbug.com/522843. |
| delegate_->PostNonNestableTask(pending_task.posted_from, |
| - std::move(pending_task.task)); |
| + base::UnsafeConvertOnceClosureToRepeating( |
|
fdoray
2016/10/06 17:37:22
Add a TODO to remove this unsafe conversion once T
tzik
2016/10/13 05:58:04
Done.
|
| + std::move(pending_task.task))); |
| return ProcessTaskResult::DEFERRED; |
| } |
| @@ -341,7 +342,7 @@ TaskQueueManager::ProcessTaskResult TaskQueueManager::ProcessTaskFromWorkQueue( |
| internal::TaskQueueImpl* prev_executing_task_queue = |
| currently_executing_task_queue_; |
| currently_executing_task_queue_ = queue; |
| - task_annotator_.RunTask("TaskQueueManager::PostTask", pending_task); |
| + task_annotator_.RunTask("TaskQueueManager::PostTask", &pending_task); |
| // Detect if the TaskQueueManager just got deleted. If this happens we must |
| // not access any member variables after this point. |
| if (protect->HasOneRef()) |