diff options
| author | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 17:10:02 +0000 |
|---|---|---|
| committer | dewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 17:10:02 +0000 |
| commit | 8e76597313bef9434cc349dd4faf81fb026a6a91 (patch) | |
| tree | e40c82451a872fe49ba66a72c6a3ebaa8e3e1f81 /base/threading | |
| parent | a4f3e2e5520ccb811a4fa8fd64f95fe0939af3d3 (diff) | |
| download | chromium_src-8e76597313bef9434cc349dd4faf81fb026a6a91.zip chromium_src-8e76597313bef9434cc349dd4faf81fb026a6a91.tar.gz chromium_src-8e76597313bef9434cc349dd4faf81fb026a6a91.tar.bz2 | |
Revert 213906 "base: Re-apply WeakPtr support for SequencedWorke..."
Speculative due to base_unittests failures.
> base: Re-apply WeakPtr support for SequencedWorkerPools, fixing deadlock
>
> This reverts the revert found here: https://codereview.chromium.org/19882002
>
> It also fixes the deadlock that caused the revert, reported here:
> http://crbug.com/261448
>
> Patchset 1 is simply what was originally committed (and reverted). Subsequent patchsets show the fix of the deadlock problem.
>
> BUG=165590
> TBR=darin
>
> Review URL: https://chromiumcodereview.appspot.com/20163004
TBR=tommycli@chromium.org
Review URL: https://codereview.chromium.org/20771002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
| -rw-r--r-- | base/threading/sequenced_worker_pool.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/base/threading/sequenced_worker_pool.cc b/base/threading/sequenced_worker_pool.cc index d992168..035ef2b 100644 --- a/base/threading/sequenced_worker_pool.cc +++ b/base/threading/sequenced_worker_pool.cc @@ -1124,10 +1124,6 @@ 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(); |