Add a new globals object for PPAPI tracking information.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

Index: webkit/plugins/ppapi/ppapi_plugin_instance.cc
===================================================================
--- webkit/plugins/ppapi/ppapi_plugin_instance.cc	(revision 106515)
+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc	(working copy)
@@ -62,6 +62,7 @@
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/event_conversion.h"
 #include "webkit/plugins/ppapi/fullscreen_container.h"
+#include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/message_channel.h"
 #include "webkit/plugins/ppapi/npapi_glue.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
@@ -102,6 +103,7 @@
 
 using base::StringPrintf;
 using ppapi::InputEventImpl;
+using ppapi::PpapiGlobals;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
@@ -242,7 +244,8 @@
 // unchanged.
 bool SecurityOriginForInstance(PP_Instance instance_id,
                                WebKit::WebSecurityOrigin* security_origin) {
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
+  PluginInstance* instance =
+      HostGlobals::Get()->host_resource_tracker()->GetInstance(instance_id);
   if (!instance)
     return false;
 
@@ -306,7 +309,7 @@
       text_input_caret_bounds_(0, 0, 0, 0),
       text_input_caret_set_(false),
       lock_mouse_callback_(PP_BlockUntilComplete()) {
-  pp_instance_ = ResourceTracker::Get()->AddInstance(this);
+  pp_instance_ = HostGlobals::Get()->host_resource_tracker()->AddInstance(this);
 
   memset(&current_print_settings_, 0, sizeof(current_print_settings_));
   DCHECK(delegate);
@@ -335,7 +338,7 @@
   delegate_->InstanceDeleted(this);
   module_->InstanceDeleted(this);
 
-  ResourceTracker::Get()->InstanceDeleted(pp_instance_);
+  HostGlobals::Get()->host_resource_tracker()->InstanceDeleted(pp_instance_);
 }
 
 // NOTE: Any of these methods that calls into the plugin needs to take into
@@ -423,7 +426,7 @@
 
 void PluginInstance::InstanceCrashed() {
   // Force free all resources and vars.
-  ResourceTracker::Get()->InstanceCrashed(pp_instance());
+  HostGlobals::Get()->host_resource_tracker()->InstanceCrashed(pp_instance());
 
   // Free any associated graphics.
   SetFullscreen(false, false);
@@ -870,7 +873,7 @@
   if (string)
     selection = UTF8ToUTF16(string->value());
   // Release the ref the plugin transfered to us.
-  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(rv);
+  HostGlobals::Get()->GetVarTracker()->ReleaseVar(rv);
   return selection;
 }
 
@@ -889,7 +892,7 @@
   if (string)
     link = UTF8ToUTF16(string->value());
   // Release the ref the plugin transfered to us.
-  ResourceTracker::Get()->GetVarTracker()->ReleaseVar(rv);
+  PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(rv);
   return link;
 }
 
Property changes on: webkit/plugins/ppapi/ppapi_plugin_instance.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/ppapi_plugin_instance.cc:r3734-4217,4606-5108,5177-5263