| 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 19e995f605c1c2c68f93a02cdc85c704207a7e20..537c8ae8e80447d33d51e5a2dbc29d015a38ce4e 100644
|
| --- a/base/threading/sequenced_task_runner_handle.cc
|
| +++ b/base/threading/sequenced_task_runner_handle.cc
|
| @@ -17,7 +17,7 @@ namespace base {
|
| namespace {
|
|
|
| LazyInstance<ThreadLocalPointer<SequencedTaskRunnerHandle>>::Leaky
|
| - lazy_tls_ptr = LAZY_INSTANCE_INITIALIZER;
|
| + lazy_tls_strh_ptr = LAZY_INSTANCE_INITIALIZER;
|
|
|
| } // namespace
|
|
|
| @@ -32,14 +32,14 @@ scoped_refptr<SequencedTaskRunner> SequencedTaskRunnerHandle::Get() {
|
| // https://crbug.com/618530#c14
|
| if (ThreadTaskRunnerHandle::IsSet()) {
|
| // Various modes of setting SequencedTaskRunnerHandle don't combine.
|
| - DCHECK(!lazy_tls_ptr.Pointer()->Get());
|
| + DCHECK(!lazy_tls_strh_ptr.Pointer()->Get());
|
| DCHECK(!SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid());
|
|
|
| return ThreadTaskRunnerHandle::Get();
|
| }
|
|
|
| // Return the registered SequencedTaskRunner, if any.
|
| - const SequencedTaskRunnerHandle* handle = lazy_tls_ptr.Pointer()->Get();
|
| + const SequencedTaskRunnerHandle* handle = lazy_tls_strh_ptr.Pointer()->Get();
|
| if (handle) {
|
| // Various modes of setting SequencedTaskRunnerHandle don't combine.
|
| DCHECK(!SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid());
|
| @@ -67,7 +67,7 @@ scoped_refptr<SequencedTaskRunner> SequencedTaskRunnerHandle::Get() {
|
|
|
| // static
|
| bool SequencedTaskRunnerHandle::IsSet() {
|
| - return lazy_tls_ptr.Pointer()->Get() ||
|
| + return lazy_tls_strh_ptr.Pointer()->Get() ||
|
| SequencedWorkerPool::GetSequenceTokenForCurrentThread().IsValid() ||
|
| ThreadTaskRunnerHandle::IsSet();
|
| }
|
| @@ -77,13 +77,13 @@ SequencedTaskRunnerHandle::SequencedTaskRunnerHandle(
|
| : task_runner_(std::move(task_runner)) {
|
| DCHECK(task_runner_->RunsTasksInCurrentSequence());
|
| DCHECK(!SequencedTaskRunnerHandle::IsSet());
|
| - lazy_tls_ptr.Pointer()->Set(this);
|
| + lazy_tls_strh_ptr.Pointer()->Set(this);
|
| }
|
|
|
| SequencedTaskRunnerHandle::~SequencedTaskRunnerHandle() {
|
| DCHECK(task_runner_->RunsTasksInCurrentSequence());
|
| - DCHECK_EQ(lazy_tls_ptr.Pointer()->Get(), this);
|
| - lazy_tls_ptr.Pointer()->Set(nullptr);
|
| + DCHECK_EQ(lazy_tls_strh_ptr.Pointer()->Get(), this);
|
| + lazy_tls_strh_ptr.Pointer()->Set(nullptr);
|
| }
|
|
|
| } // namespace base
|
|
|