| Index: ppapi/proxy/ppp_instance_proxy.cc
|
| diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc
|
| index c3e73953135e67ad3d9d2a4b0ee8ad8d9438bacd..9463f2826623bb0451cb298055ccdb9b673d10af 100644
|
| --- a/ppapi/proxy/ppp_instance_proxy.cc
|
| +++ b/ppapi/proxy/ppp_instance_proxy.cc
|
| @@ -15,6 +15,7 @@
|
| #include "ppapi/proxy/plugin_resource_tracker.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/proxy/ppb_url_loader_proxy.h"
|
| +#include "ppapi/shared_impl/ppapi_globals.h"
|
|
|
| namespace ppapi {
|
| namespace proxy {
|
| @@ -175,7 +176,7 @@ void PPP_Instance_Proxy::OnMsgDidCreate(
|
| PluginDispatcher* plugin_dispatcher =
|
| static_cast<PluginDispatcher*>(dispatcher());
|
| plugin_dispatcher->DidCreateInstance(instance);
|
| - ppapi::TrackerBase::Get()->GetResourceTracker()->DidCreateInstance(instance);
|
| + PpapiGlobals::Get()->GetResourceTracker()->DidCreateInstance(instance);
|
|
|
| // Make sure the arrays always have at least one element so we can take the
|
| // address below.
|
| @@ -196,7 +197,7 @@ void PPP_Instance_Proxy::OnMsgDidCreate(
|
|
|
| void PPP_Instance_Proxy::OnMsgDidDestroy(PP_Instance instance) {
|
| combined_interface_->DidDestroy(instance);
|
| - ppapi::TrackerBase::Get()->GetResourceTracker()->DidDeleteInstance(instance);
|
| + PpapiGlobals::Get()->GetResourceTracker()->DidDeleteInstance(instance);
|
| static_cast<PluginDispatcher*>(dispatcher())->DidDestroyInstance(instance);
|
| }
|
|
|
| @@ -235,7 +236,7 @@ void PPP_Instance_Proxy::OnMsgHandleDocumentLoad(PP_Instance instance,
|
| // representing all plugin references).
|
| // Once all references at the plugin side are released, the renderer side will
|
| // be notified and release the reference added in HandleDocumentLoad() above.
|
| - PluginResourceTracker::GetInstance()->ReleaseResource(plugin_loader);
|
| + PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(plugin_loader);
|
| }
|
|
|
| } // namespace proxy
|
|
|