summaryrefslogtreecommitdiffstats
path: root/content/ppapi_plugin
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 /content/ppapi_plugin
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 'content/ppapi_plugin')
-rw-r--r--content/ppapi_plugin/ppapi_thread.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h
index cc58362..430e168 100644
--- a/content/ppapi_plugin/ppapi_thread.h
+++ b/content/ppapi_plugin/ppapi_thread.h
@@ -18,6 +18,7 @@
#include "ppapi/c/pp_module.h"
#include "ppapi/c/trusted/ppp_broker.h"
#include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/plugin_globals.h"
class FilePath;
class PpapiWebKitThread;
@@ -66,6 +67,9 @@ class PpapiThread : public ChildThread,
base::ScopedNativeLibrary library_;
+ // Global state tracking for the proxy.
+ ppapi::proxy::PluginGlobals plugin_globals_;
+
ppapi::proxy::Dispatcher::GetInterfaceFunc get_plugin_interface_;
// Callback to call when a new instance connects to the broker.