Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/ppb_proxy_impl.cc

Index: webkit/plugins/ppapi/ppb_proxy_impl.cc
===================================================================
--- webkit/plugins/ppapi/ppb_proxy_impl.cc	(revision 106515)
+++ webkit/plugins/ppapi/ppb_proxy_impl.cc	(working copy)
@@ -7,11 +7,13 @@
 #include "ppapi/c/private/ppb_proxy_private.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
+#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
 
+using ppapi::PpapiGlobals;
 using ppapi::thunk::EnterResource;
 using ppapi::thunk::PPB_URLLoader_API;
 
@@ -21,13 +23,15 @@
 namespace {
 
 void PluginCrashed(PP_Module module) {
-  PluginModule* plugin_module = ResourceTracker::Get()->GetModule(module);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->host_resource_tracker()->GetModule(module);
   if (plugin_module)
     plugin_module->PluginCrashed();
 }
 
 PP_Instance GetInstanceForResource(PP_Resource resource) {
-  ::ppapi::Resource* obj = ResourceTracker::Get()->GetResource(resource);
+  ::ppapi::Resource* obj =
+      PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
   if (!obj)
     return 0;
   return obj->pp_instance();
@@ -35,7 +39,8 @@
 
 void SetReserveInstanceIDCallback(PP_Module module,
                                   PP_Bool (*reserve)(PP_Module, PP_Instance)) {
-  PluginModule* plugin_module = ResourceTracker::Get()->GetModule(module);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->host_resource_tracker()->GetModule(module);
   if (plugin_module)
     plugin_module->SetReserveInstanceIDCallback(reserve);
 }
@@ -48,19 +53,22 @@
 }
 
 void AddRefModule(PP_Module module) {
-  PluginModule* plugin_module = ResourceTracker::Get()->GetModule(module);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->host_resource_tracker()->GetModule(module);
   if (plugin_module)
     plugin_module->AddRef();
 }
 
 void ReleaseModule(PP_Module module) {
-  PluginModule* plugin_module = ResourceTracker::Get()->GetModule(module);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->host_resource_tracker()->GetModule(module);
   if (plugin_module)
     plugin_module->Release();
 }
 
 PP_Bool IsInModuleDestructor(PP_Module module) {
-  PluginModule* plugin_module = ResourceTracker::Get()->GetModule(module);
+  PluginModule* plugin_module =
+      HostGlobals::Get()->host_resource_tracker()->GetModule(module);
   if (plugin_module)
     return PP_FromBool(plugin_module->is_in_destructor());
   return PP_FALSE;
Property changes on: webkit/plugins/ppapi/ppb_proxy_impl.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppb_proxy_impl.cc:r3734-4217,4606-5108,5177-5263