From 794d83cda5183b25665e99296ab6f5e6c1dbf2dc Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 20 Oct 2011 19:09:20 +0000 Subject: Add a new globals object for PPAPI tracking information. [ Reland of 106142: http://codereview.chromium.org/8316008 ] This adds a specialization on the host and plugin side of the proxy. This replaces the ad-hoc singleton tracking done by the resource and var trackers with just being getters on this global object. Most code can use the single PpapiGlobals class. I also allow code to get the host and plugin specializations since some code needs access to some specific features of each side. In a later pass I'll move the other stuff out of TrackerBase and delete it. TEST=none BUG=none Review URL: http://codereview.chromium.org/8344025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106537 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/ppp_instance_proxy.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ppapi/proxy/ppp_instance_proxy.cc') diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc index c3e7395..9463f28 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(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(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 -- cgit v1.1