TrackedObjects assumes you can use a "TLS slot" of -1 to indicate uninitialized. This isn't true for the pthread_key_t type, which is unsigned on Linux and reportedly a struct on Macs. This change modifies the Slot type to be a struct containing an "initialized" flag.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1113 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 8 deletions

diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index 62e1357..405acb5 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -45,7 +45,9 @@
 
 namespace NPAPI
 {
-int PluginInstance::plugin_instance_tls_index_ = ThreadLocalStorage::Alloc();
+
+// TODO(evanm): don't rely on static initialization.
+ThreadLocalStorage::Slot PluginInstance::plugin_instance_tls_index_;
 
 PluginInstance::PluginInstance(PluginLib *plugin, const std::string &mime_type)
     : plugin_(plugin),
@@ -429,17 +431,16 @@ void PluginInstance::OnPluginThreadAsyncCall(void (*func)(void *),
 PluginInstance* PluginInstance::SetInitializingInstance(
     PluginInstance* instance) {
   PluginInstance* old_instance =
-      static_cast<PluginInstance*>(
-          ThreadLocalStorage::Get(plugin_instance_tls_index_));
-  ThreadLocalStorage::Set(plugin_instance_tls_index_, instance);
+      static_cast<PluginInstance*>(plugin_instance_tls_index_.Get());
+  plugin_instance_tls_index_.Set(instance);
   return old_instance;
 }
 
 PluginInstance* PluginInstance::GetInitializingInstance() {
   PluginInstance* instance =
-      static_cast<PluginInstance*>(
-          ThreadLocalStorage::Get(plugin_instance_tls_index_));
-  return instance;}
+      static_cast<PluginInstance*>(plugin_instance_tls_index_.Get());
+  return instance;
+}
 
 NPError PluginInstance::GetServiceManager(void** service_manager) {
   if (!mozilla_extenstions_) {
diff --git a/webkit/glue/plugins/plugin_instance.h b/webkit/glue/plugins/plugin_instance.h
index 5743c24..6cbfd5a 100644
--- a/webkit/glue/plugins/plugin_instance.h
+++ b/webkit/glue/plugins/plugin_instance.h
@@ -40,6 +40,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/thread_local_storage.h"
 #include "webkit/glue/plugins/nphostapi.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
@@ -261,7 +262,7 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
   // We need to pass this instance to the service manager 
   // (MozillaExtensionApi) created as a result of NPN_GetValue
   // in the context of NP_Initialize. 
-  static int                               plugin_instance_tls_index_;
+  static ThreadLocalStorage::Slot          plugin_instance_tls_index_;
   scoped_refptr<PluginDataStream>          plugin_data_stream_;
   GURL                                     instance_url_;