Reland 9034035: Make it possible to have 1 PpapiGlobals per thread.

webkit/plugins/ppapi/host_globals.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/host_globals.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 27 matching lines @@
       function_proxies[::ppapi::API_ID_COUNT];
 };
 
 HostGlobals* HostGlobals::host_globals_ = NULL;
 
 HostGlobals::HostGlobals() : ::ppapi::PpapiGlobals() {
   DCHECK(!host_globals_);
   host_globals_ = this;
 }
 
+HostGlobals::HostGlobals(::ppapi::PpapiGlobals::ForTest for_test)
+    : ::ppapi::PpapiGlobals(for_test) {
+  DCHECK(!host_globals_);
+}
+
 HostGlobals::~HostGlobals() {
-  DCHECK(host_globals_ == this);
+  DCHECK(host_globals_ == this || !host_globals_);
   host_globals_ = NULL;
 }
 
 ::ppapi::ResourceTracker* HostGlobals::GetResourceTracker() {
   return &resource_tracker_;
 }
 
 ::ppapi::VarTracker* HostGlobals::GetVarTracker() {
   return &host_var_tracker_;
 }
@@ skipping 49 matching lines @@
   return proxy.get();
 }
 
 PP_Module HostGlobals::GetModuleForInstance(PP_Instance instance) {
   PluginInstance* inst = GetInstance(instance);
   if (!inst)
     return 0;
   return inst->module()->pp_module();
 }
 
+base::Lock* HostGlobals::GetProxyLock() {
+  // We do not lock on the host side.
+  return NULL;
+}
+
 PP_Module HostGlobals::AddModule(PluginModule* module) {
 #ifndef NDEBUG
   // Make sure we're not adding one more than once.
   for (ModuleMap::const_iterator i = module_map_.begin();
        i != module_map_.end(); ++i)
     DCHECK(i->second != module);
 #endif
 
   // See AddInstance.
   PP_Module new_module;
@@ skipping 61 matching lines @@
 
 PluginInstance* HostGlobals::GetInstance(PP_Instance instance) {
   DLOG_IF(ERROR, !CheckIdType(instance, ::ppapi::PP_ID_TYPE_INSTANCE))
       << instance << " is not a PP_Instance.";
   InstanceMap::iterator found = instance_map_.find(instance);
   if (found == instance_map_.end())
     return NULL;
   return found->second->instance;
 }
 
+bool HostGlobals::IsHostGlobals() const {
+  return true;
+}
+
 }  // namespace ppapi
 }  // namespace webkit