summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/plugin_resource_tracker.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 22:51:01 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 22:51:01 +0000
commit2f59e3827f5bf5dc1cad0a0a393feef965abc6bc (patch)
tree156a9acb7570a78e31256f03726bd0b8984c8f3e /ppapi/proxy/plugin_resource_tracker.cc
parent7969c78bba2a31c8b50f4e19e497bf81694f6388 (diff)
downloadchromium_src-2f59e3827f5bf5dc1cad0a0a393feef965abc6bc.zip
chromium_src-2f59e3827f5bf5dc1cad0a0a393feef965abc6bc.tar.gz
chromium_src-2f59e3827f5bf5dc1cad0a0a393feef965abc6bc.tar.bz2
Remove TrackerBase.
Fold the methods it provided into the PpapiGlobals base class. Move the instance and module tracking in the webkit/plugins/ppapi dir out of the HostResourceTracker (since it has nothing to do with resources) and into the HostGlobals object (which provides general global object tracking). TEST=none BUG=none Review URL: http://codereview.chromium.org/8335001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_resource_tracker.cc')
-rw-r--r--ppapi/proxy/plugin_resource_tracker.cc27
1 files changed, 0 insertions, 27 deletions
diff --git a/ppapi/proxy/plugin_resource_tracker.cc b/ppapi/proxy/plugin_resource_tracker.cc
index 67e2d69..e91b35f 100644
--- a/ppapi/proxy/plugin_resource_tracker.cc
+++ b/ppapi/proxy/plugin_resource_tracker.cc
@@ -12,20 +12,11 @@
#include "ppapi/proxy/serialized_var.h"
#include "ppapi/shared_impl/proxy_lock.h"
#include "ppapi/shared_impl/resource.h"
-#include "ppapi/shared_impl/tracker_base.h"
#include "ppapi/shared_impl/var.h"
namespace ppapi {
namespace proxy {
-namespace {
-
-TrackerBase* GetTrackerBase() {
- return PluginGlobals::Get()->plugin_resource_tracker();
-}
-
-} // namespace
-
PluginResourceTracker::PluginResourceTracker() {
#ifdef ENABLE_PEPPER_THREADING
// Set the global proxy lock, since the plugin-side of the proxy needs to be
@@ -40,11 +31,6 @@ PluginResourceTracker::~PluginResourceTracker() {
#endif
}
-// static
-TrackerBase* PluginResourceTracker::GetTrackerBaseInstance() {
- return GetTrackerBase();
-}
-
PP_Resource PluginResourceTracker::PluginResourceForHostResource(
const HostResource& resource) const {
HostResourceMap::const_iterator found = host_resource_map_.find(resource);
@@ -53,19 +39,6 @@ PP_Resource PluginResourceTracker::PluginResourceForHostResource(
return found->second;
}
-FunctionGroupBase* PluginResourceTracker::GetFunctionAPI(PP_Instance inst,
- InterfaceID id) {
- PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(inst);
- if (dispatcher)
- return dispatcher->GetFunctionAPI(id);
- return NULL;
-}
-
-PP_Module PluginResourceTracker::GetModuleForInstance(PP_Instance instance) {
- // Currently proxied plugins don't use the PP_Module for anything useful.
- return 0;
-}
-
PP_Resource PluginResourceTracker::AddResource(Resource* object) {
PP_Resource ret = ResourceTracker::AddResource(object);