Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: base/threading/sequenced_task_runner_handle.cc

Issue 1414793009: Allow SequencedTaskRunnerHandle::Get() while running unsequenced tasks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/threading/sequenced_task_runner_handle.cc
diff --git a/base/threading/sequenced_task_runner_handle.cc b/base/threading/sequenced_task_runner_handle.cc
index a03642de42061cef29a2842fee5abbbc9a17df44..081f11f78b31eee9ecb1c6143e61f30a7bbee9c9 100644
--- a/base/threading/sequenced_task_runner_handle.cc
+++ b/base/threading/sequenced_task_runner_handle.cc
@@ -12,26 +12,19 @@ namespace base {
// static
scoped_refptr<SequencedTaskRunner> SequencedTaskRunnerHandle::Get() {
- // If we are on a worker thread for a SequencedBlockingPool that is running a
- // sequenced task, return a SequencedTaskRunner for it.
- scoped_refptr<base::SequencedWorkerPool> pool =
- SequencedWorkerPool::GetWorkerPoolForCurrentThread();
- if (pool) {
- SequencedWorkerPool::SequenceToken sequence_token =
- SequencedWorkerPool::GetSequenceTokenForCurrentThread();
- DCHECK(sequence_token.IsValid());
- DCHECK(pool->IsRunningSequenceOnCurrentThread(sequence_token));
- return pool->GetSequencedTaskRunner(sequence_token);
- }
+ // Return the SequencedTaskRunner if found or the SingleThreadedTaskRunner for
+ // the current thread otherwise.
+ scoped_refptr<base::SequencedTaskRunner> task_runner =
+ SequencedWorkerPool::GetSequencedTaskRunnerForCurrentThread();
+ if (task_runner)
+ return task_runner;
- // Otherwise, return a SingleThreadTaskRunner for the current thread.
return base::ThreadTaskRunnerHandle::Get();
}
// static
bool SequencedTaskRunnerHandle::IsSet() {
- return (SequencedWorkerPool::GetWorkerPoolForCurrentThread() &&
- SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid()) ||
+ return SequencedWorkerPool::GetWorkerPoolForCurrentThread() ||
base::ThreadTaskRunnerHandle::IsSet();
}
« no previous file with comments | « base/threading/sequenced_task_runner_handle.h ('k') | base/threading/sequenced_task_runner_handle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698