| Index: ppapi/proxy/ppb_var_deprecated_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppb_var_deprecated_proxy.cc (revision 106146)
|
| +++ ppapi/proxy/ppb_var_deprecated_proxy.cc (working copy)
|
| @@ -15,7 +15,6 @@
|
| #include "ppapi/c/ppb_core.h"
|
| #include "ppapi/proxy/host_dispatcher.h"
|
| #include "ppapi/proxy/plugin_dispatcher.h"
|
| -#include "ppapi/proxy/plugin_globals.h"
|
| #include "ppapi/proxy/plugin_resource_tracker.h"
|
| #include "ppapi/proxy/plugin_var_tracker.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| @@ -42,9 +41,8 @@
|
|
|
| if (object.type == PP_VARTYPE_OBJECT) {
|
| // Get the dispatcher for the object.
|
| - PluginDispatcher* dispatcher =
|
| - PluginGlobals::Get()->plugin_var_tracker()->
|
| - DispatcherForPluginObject(object);
|
| + PluginDispatcher* dispatcher = PluginResourceTracker::GetInstance()->
|
| + var_tracker().DispatcherForPluginObject(object);
|
| if (dispatcher)
|
| return dispatcher;
|
| }
|
| @@ -61,11 +59,11 @@
|
| // PPB_Var_Deprecated plugin ---------------------------------------------------
|
|
|
| void AddRefVar(PP_Var var) {
|
| - PpapiGlobals::Get()->GetVarTracker()->AddRefVar(var);
|
| + PluginResourceTracker::GetInstance()->var_tracker().AddRefVar(var);
|
| }
|
|
|
| void ReleaseVar(PP_Var var) {
|
| - PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(var);
|
| + PluginResourceTracker::GetInstance()->var_tracker().ReleaseVar(var);
|
| }
|
|
|
| PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) {
|
|
|