diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 19:26:40 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 19:26:40 +0000 |
| commit | d52426cf3429ee05807a97c7c22ed16494abb774 (patch) | |
| tree | a7c9aa2c1b3974c8e985e577afbce7cc1803276a /base/threading | |
| parent | 71316604afb68ed5926ff25dc952c4d14000d2c1 (diff) | |
| download | chromium_src-d52426cf3429ee05807a97c7c22ed16494abb774.zip chromium_src-d52426cf3429ee05807a97c7c22ed16494abb774.tar.gz chromium_src-d52426cf3429ee05807a97c7c22ed16494abb774.tar.bz2 | |
base: Re-re-apply WeakPtr support for SequencedWorkerPools
This is a continuation of https://codereview.chromium.org/20163004/#ps55001 and identical to Patchset 4. I'm adding back some death test threadsafe flags that got dropped from the re-apply.
In other words, this CL is:
https://codereview.chromium.org/20163004/#ps55001 +
https://codereview.chromium.org/19617002/
Feel free to revert if it causes issues again.
TBR=akalin,darin,dewittj,rnk
BUG=165590
Review URL: https://codereview.chromium.org/20754006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
| -rw-r--r-- | base/threading/sequenced_worker_pool.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc index 035ef2b..d992168 100644 --- a/base/threading/sequenced_worker_pool.cc +++ b/base/threading/sequenced_worker_pool.cc @@ -1124,6 +1124,10 @@ SequencedWorkerPool::Inner::g_last_sequence_number_; // static SequencedWorkerPool::SequenceToken SequencedWorkerPool::GetSequenceTokenForCurrentThread() { + // Don't construct lazy instance on check. + if (g_lazy_tls_ptr == NULL) + return SequenceToken(); + SequencedWorkerPool::SequenceToken* token = g_lazy_tls_ptr.Get().Get(); if (!token) return SequenceToken(); |