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

Unified Diff: base/message_loop.cc

Issue 1699: Fix a mis-merge in TLS changes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/message_loop.cc
===================================================================
--- base/message_loop.cc (revision 1982)
+++ base/message_loop.cc (working copy)
@@ -90,9 +90,6 @@
FOR_EACH_OBSERVER(DestructionObserver, destruction_observers_,
WillDestroyCurrentMessageLoop());
- // OK, now make it so that no one can find us.
- lazy_tls_ptr.Pointer()->Set(NULL);
-
DCHECK(!state_);
// Clean up any unprocessed tasks, but take care: deleting a task could
@@ -113,7 +110,7 @@
DCHECK(!did_work);
// OK, now make it so that no one can find us.
- tls_index_.Set(NULL);
+ lazy_tls_ptr.Pointer()->Set(NULL);
}
void MessageLoop::AddDestructionObserver(DestructionObserver *obs) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698