summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_instance_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 19:09:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 19:09:20 +0000
commit794d83cda5183b25665e99296ab6f5e6c1dbf2dc (patch)
tree5b69cd2fa55d7eb0ac3c9a98f1012358e2f349b2 /ppapi/proxy/ppb_instance_proxy.cc
parent83c23571249a13c68d07122070bf73c2a9cd435e (diff)
downloadchromium_src-794d83cda5183b25665e99296ab6f5e6c1dbf2dc.zip
chromium_src-794d83cda5183b25665e99296ab6f5e6c1dbf2dc.tar.gz
chromium_src-794d83cda5183b25665e99296ab6f5e6c1dbf2dc.tar.bz2
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
Diffstat (limited to 'ppapi/proxy/ppb_instance_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 0d79df43..f11f396 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -11,9 +11,9 @@
#include "ppapi/c/ppb_mouse_lock.h"
#include "ppapi/proxy/host_dispatcher.h"
#include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_var.h"
+#include "ppapi/shared_impl/ppapi_globals.h"
#include "ppapi/shared_impl/url_util_impl.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/thunk.h"
@@ -123,7 +123,8 @@ PPB_Instance_FunctionAPI* PPB_Instance_Proxy::AsPPB_Instance_FunctionAPI() {
PP_Bool PPB_Instance_Proxy::BindGraphics(PP_Instance instance,
PP_Resource device) {
- Resource* object = PluginResourceTracker::GetInstance()->GetResource(device);
+ Resource* object =
+ PpapiGlobals::Get()->GetResourceTracker()->GetResource(device);
if (!object || object->pp_instance() != instance)
return PP_FALSE;