diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 21:47:40 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-20 21:47:40 +0000 |
| commit | c3ec35638ea6594b6bdbac7ff92c38add8984623 (patch) | |
| tree | c51541ac2451e66c410b3d244e1f59ac2218c57e /webkit/glue/plugins/plugin_instance.cc | |
| parent | e537c3515e270527ba2fa54fcfc4a1ed49cc975e (diff) | |
| download | chromium_src-c3ec35638ea6594b6bdbac7ff92c38add8984623.zip chromium_src-c3ec35638ea6594b6bdbac7ff92c38add8984623.tar.gz chromium_src-c3ec35638ea6594b6bdbac7ff92c38add8984623.tar.bz2 | |
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
Diffstat (limited to 'webkit/glue/plugins/plugin_instance.cc')
| -rw-r--r-- | webkit/glue/plugins/plugin_instance.cc | 15 |
1 files changed, 8 insertions, 7 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_) { |