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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 | 268 |
269 void TaskQueueManager::DidQueueTask( | 269 void TaskQueueManager::DidQueueTask( |
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::Task pending_task = | 278 internal::TaskQueueImpl* queue = work_queue->task_queue(); |
279 work_queue->TakeTaskFromWorkQueue(); | |
280 | 279 |
281 // It's possible the task was canceled, if so bail out. | |
282 if (pending_task.task.IsCancelled()) | |
283 return ProcessTaskResult::EXECUTED; | |
284 | |
285 internal::TaskQueueImpl* queue = work_queue->task_queue(); | |
286 if (queue->GetQuiescenceMonitored()) | 280 if (queue->GetQuiescenceMonitored()) |
287 task_was_run_on_quiescence_monitored_queue_ = true; | 281 task_was_run_on_quiescence_monitored_queue_ = true; |
288 | 282 |
| 283 internal::TaskQueueImpl::Task pending_task = |
| 284 work_queue->TakeTaskFromWorkQueue(); |
289 if (!pending_task.nestable && delegate_->IsNested()) { | 285 if (!pending_task.nestable && delegate_->IsNested()) { |
290 // Defer non-nestable work to the main task runner. NOTE these tasks can be | 286 // Defer non-nestable work to the main task runner. NOTE these tasks can be |
291 // arbitrarily delayed so the additional delay should not be a problem. | 287 // arbitrarily delayed so the additional delay should not be a problem. |
292 // TODO(skyostil): Figure out a way to not forget which task queue the | 288 // TODO(skyostil): Figure out a way to not forget which task queue the |
293 // task is associated with. See http://crbug.com/522843. | 289 // task is associated with. See http://crbug.com/522843. |
294 delegate_->PostNonNestableTask(pending_task.posted_from, | 290 delegate_->PostNonNestableTask(pending_task.posted_from, pending_task.task); |
295 std::move(pending_task.task)); | |
296 return ProcessTaskResult::DEFERRED; | 291 return ProcessTaskResult::DEFERRED; |
297 } | 292 } |
298 | 293 |
299 MaybeRecordTaskDelayHistograms(pending_task, queue); | 294 MaybeRecordTaskDelayHistograms(pending_task, queue); |
300 | 295 |
301 TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue", | 296 TRACE_TASK_EXECUTION("TaskQueueManager::ProcessTaskFromWorkQueue", |
302 pending_task); | 297 pending_task); |
303 if (queue->GetShouldNotifyObservers()) { | 298 if (queue->GetShouldNotifyObservers()) { |
304 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_, | 299 FOR_EACH_OBSERVER(base::MessageLoop::TaskObserver, task_observers_, |
305 WillProcessTask(pending_task)); | 300 WillProcessTask(pending_task)); |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 DCHECK(main_thread_checker_.CalledOnValidThread()); | 432 DCHECK(main_thread_checker_.CalledOnValidThread()); |
438 DCHECK(!work_queue->Empty()); | 433 DCHECK(!work_queue->Empty()); |
439 if (observer_) { | 434 if (observer_) { |
440 observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(), | 435 observer_->OnTriedToExecuteBlockedTask(*work_queue->task_queue(), |
441 *work_queue->GetFrontTask()); | 436 *work_queue->GetFrontTask()); |
442 } | 437 } |
443 } | 438 } |
444 | 439 |
445 } // namespace scheduler | 440 } // namespace scheduler |
446 } // namespace blink | 441 } // namespace blink |
OLD | NEW |