Revert 106142 - Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/ppb_var_impl.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/ppb_var_impl.h"
 
 #include <limits>
 
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/pp_var.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/plugins/ppapi/common.h"
-#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/npapi_glue.h"
 #include "webkit/plugins/ppapi/npobject_var.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/plugin_object.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 #include "v8/include/v8.h"
 
 using ppapi::NPObjectVar;
-using ppapi::PpapiGlobals;
 using ppapi::StringVar;
 using ppapi::Var;
 using WebKit::WebBindings;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 const char kInvalidObjectException[] = "Error: Invalid object";
@@ skipping 84 matching lines @@
       SetInvalidObjectException();
     } else {
       // When the object is valid, we have a valid module to associate
       set_pp_module(object_->pp_module());
     }
   }
 
   NPObjectVar* object() { return object_.get(); }
 
   PluginInstance* GetPluginInstance() {
-    return HostGlobals::Get()->host_resource_tracker()->GetInstance(
-      object()->pp_instance());
+    return ResourceTracker::Get()->GetInstance(object()->pp_instance());
   }
 
  protected:
   scoped_refptr<NPObjectVar> object_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectAccessorTryCatch);
 };
 
 // ObjectAccessiorWithIdentifierTryCatch ---------------------------------------
 
@@ skipping 25 matching lines @@
 
  private:
   NPIdentifier identifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectAccessorWithIdentifierTryCatch);
 };
 
 // PPB_Var methods -------------------------------------------------------------
 
 void AddRefVar(PP_Var var) {
-  PpapiGlobals::Get()->GetVarTracker()->AddRefVar(var);
+  ResourceTracker::Get()->GetVarTracker()->AddRefVar(var);
 }
 
 void ReleaseVar(PP_Var var) {
-  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(var);
+  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(var);
 }
 
 PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
   return StringVar::StringToPPVar(module, data, len);
 }
 
 const char* VarToUtf8(PP_Var var, uint32_t* len) {
   StringVar* str = StringVar::FromPPVar(var);
   if (!str) {
     *len = 0;
@@ skipping 209 matching lines @@
                             const PPP_Class_Deprecated* ppp_class,
                             void** ppp_class_data) {
   scoped_refptr<NPObjectVar> object(NPObjectVar::FromPPVar(var));
   if (!object)
     return false;  // Not an object at all.
 
   return PluginObject::IsInstanceOf(object->np_object(),
                                     ppp_class, ppp_class_data);
 }
 
-PP_Var CreateObjectDeprecated(PP_Instance pp_instance,
+PP_Var CreateObjectDeprecated(PP_Instance instance_id,
                               const PPP_Class_Deprecated* ppp_class,
                               void* ppp_class_data) {
-  PluginInstance* instance =
-      HostGlobals::Get()->host_resource_tracker()->GetInstance(pp_instance);
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance) {
     DLOG(ERROR) << "Create object passed an invalid instance.";
     return PP_MakeNull();
   }
   return PluginObject::Create(instance, ppp_class, ppp_class_data);
 }
 
-PP_Var CreateObjectWithModuleDeprecated(PP_Module pp_module,
+PP_Var CreateObjectWithModuleDeprecated(PP_Module module_id,
                                         const PPP_Class_Deprecated* ppp_class,
                                         void* ppp_class_data) {
-  PluginModule* module =
-      HostGlobals::Get()->host_resource_tracker()->GetModule(pp_module);
+  PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
   if (!module)
     return PP_MakeNull();
   return PluginObject::Create(module->GetSomeInstance(),
                               ppp_class, ppp_class_data);
 }
 
 const PPB_Var_Deprecated var_deprecated_interface = {
   &AddRefVar,
   &ReleaseVar,
   &VarFromUtf8,
@@ skipping 26 matching lines @@
 }
 
 // static
 const PPB_Var_Deprecated* PPB_Var_Impl::GetVarDeprecatedInterface() {
   return &var_deprecated_interface;
 }
 
 }  // namespace ppapi
 }  // namespace webkit