summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 16:52:09 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-30 16:52:09 +0000
commit444b8a3c2cb9f74a280eb370abd8792d51870dcb (patch)
tree37be62fef7f7a45a1e93dee5e898e5d25aa40962 /ppapi
parent0d4cd065a9b3e28de6ae1e332e1b5fe1d38d6cb6 (diff)
downloadchromium_src-444b8a3c2cb9f74a280eb370abd8792d51870dcb.zip
chromium_src-444b8a3c2cb9f74a280eb370abd8792d51870dcb.tar.gz
chromium_src-444b8a3c2cb9f74a280eb370abd8792d51870dcb.tar.bz2
Make it possible to use ThreadLocalStorage::Slot as a static without
introducing static initializers. Member variables can stay TLS::Slots and their behavior doesn't change. Static instances use TLS::StaticSlot instead. Kind of like http://codereview.chromium.org/8491043 but for TLS. BUG=none TEST=none TBR=agl Review URL: https://chromiumcodereview.appspot.com/9297010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppb_message_loop_proxy.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc
index 5a0cf23..75f9c86 100644
--- a/ppapi/proxy/ppb_message_loop_proxy.cc
+++ b/ppapi/proxy/ppb_message_loop_proxy.cc
@@ -26,7 +26,7 @@ namespace {
typedef thunk::EnterResource<PPB_MessageLoop_API> EnterMessageLoop;
-static base::ThreadLocalStorage::Slot tls_slot(base::LINKER_INITIALIZED);
+static base::ThreadLocalStorage::StaticSlot tls_slot = TLS_INITIALIZER;
class MessageLoopResource : public Resource, public PPB_MessageLoop_API {
public: