OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "platform/scheduler/base/task_queue_manager.h" | 5 #include "platform/scheduler/base/task_queue_manager.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
270 const internal::TaskQueueImpl::Task& pending_task) { | 270 const internal::TaskQueueImpl::Task& pending_task) { |
271 task_annotator_.DidQueueTask("TaskQueueManager::PostTask", pending_task); | 271 task_annotator_.DidQueueTask("TaskQueueManager::PostTask", pending_task); |
272 } | 272 } |
273 | 273 |
274 TaskQueueManager::ProcessTaskResult TaskQueueManager::ProcessTaskFromWorkQueue( | 274 TaskQueueManager::ProcessTaskResult TaskQueueManager::ProcessTaskFromWorkQueue( |
275 internal::WorkQueue* work_queue) { | 275 internal::WorkQueue* work_queue) { |
276 DCHECK(main_thread_checker_.CalledOnValidThread()); | 276 DCHECK(main_thread_checker_.CalledOnValidThread()); |
277 scoped_refptr<DeletionSentinel> protect(deletion_sentinel_); | 277 scoped_refptr<DeletionSentinel> protect(deletion_sentinel_); |
278 internal::TaskQueueImpl* queue = work_queue->task_queue(); | 278 internal::TaskQueueImpl* queue = work_queue->task_queue(); |
279 | 279 |
280 if (queue->GetQuiescenceMonitored()) | 280 if (queue->GetQuiescenceMonitored()) |
Sami
2016/09/08 16:35:02
Might want to move this below the early-out.
alex clarke (OOO till 29th)
2016/09/08 16:43:28
Done.
| |
281 task_was_run_on_quiescence_monitored_queue_ = true; | 281 task_was_run_on_quiescence_monitored_queue_ = true; |
282 | 282 |
283 internal::TaskQueueImpl::Task pending_task = | 283 internal::TaskQueueImpl::Task pending_task = |
284 work_queue->TakeTaskFromWorkQueue(); | 284 work_queue->TakeTaskFromWorkQueue(); |
285 | |
286 // It's possible the task was canceled, if so bail out. | |
287 if (pending_task.task.IsCancelled()) | |
288 return ProcessTaskResult::EXECUTED; | |
289 | |
285 if (!pending_task.nestable && delegate_->IsNested()) { | 290 if (!pending_task.nestable && delegate_->IsNested()) { |
286 // Defer non-nestable work to the main task runner. NOTE these tasks can be | 291 // Defer non-nestable work to the main task runner. NOTE these tasks can be |
287 // arbitrarily delayed so the additional delay should not be a problem. | 292 // arbitrarily delayed so the additional delay should not be a problem. |
288 // TODO(skyostil): Figure out a way to not forget which task queue the | 293 // TODO(skyostil): Figure out a way to not forget which task queue the |
289 // task is associated with. See http://crbug.com/522843. | 294 // task is associated with. See http://crbug.com/522843. |
290 delegate_->PostNonNestableTask(pending_task.posted_from, pending_task.task); | 295 delegate_->PostNonNestableTask(pending_task.posted_from, |
296 std::move(pending_task.task)); | |
291 return ProcessTaskResult::DEFERRED; | 297 return ProcessTaskResult::DEFERRED; |
292 } | 298 } |
293 | 299 |
294 MaybeRecordTaskDelayHistograms(pending_task, queue); | 300 MaybeRecordTaskDelayHistograms(pending_task, queue); |
295 | 301 |
296 TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue", | 302 TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue", |
297 pending_task); | 303 pending_task); |
298 if (queue->GetShouldNotifyObservers()) { | 304 if (queue->GetShouldNotifyObservers()) { |
299 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_, | 305 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_, |
300 WillProcessTask(pending_task)); | 306 WillProcessTask(pending_task)); |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
432 DCHECK(main_thread_checker_.CalledOnValidThread()); | 438 DCHECK(main_thread_checker_.CalledOnValidThread()); |
433 DCHECK(!work_queue->Empty()); | 439 DCHECK(!work_queue->Empty()); |
434 if (observer_) { | 440 if (observer_) { |
435 observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(), | 441 observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(), |
436 *work_queue->GetFrontTask()); | 442 *work_queue->GetFrontTask()); |
437 } | 443 } |
438 } | 444 } |
439 | 445 |
440 } // namespace scheduler | 446 } // namespace scheduler |
441 } // namespace blink | 447 } // namespace blink |
OLD | NEW |