From faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4 Mon Sep 17 00:00:00 2001 From: "sail@chromium.org" Date: Tue, 18 Oct 2011 22:16:26 +0000 Subject: Revert 106142 - Add a new globals object for PPAPI tracking information. 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/8316008 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8342016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/plugin_globals.h | 50 -------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 ppapi/proxy/plugin_globals.h (limited to 'ppapi/proxy/plugin_globals.h') diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h deleted file mode 100644 index 141b904..0000000 --- a/ppapi/proxy/plugin_globals.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef PPAPI_PROXY_PLUGIN_GLOBALS_H_ -#define PPAPI_PROXY_PLUGIN_GLOBALS_H_ - -#include "base/compiler_specific.h" -#include "ppapi/proxy/plugin_resource_tracker.h" -#include "ppapi/proxy/plugin_var_tracker.h" -#include "ppapi/shared_impl/ppapi_globals.h" - -namespace ppapi { -namespace proxy { - -class PluginGlobals : public PpapiGlobals { - public: - PluginGlobals(); - virtual ~PluginGlobals(); - - // Getter for the global singleton. Generally, you should use - // PpapiGlobals::Get() when possible. Use this only when you need some - // plugin-specific functionality. - inline static PluginGlobals* Get() { return plugin_globals_; } - - // PpapiGlobals implementation. - virtual ResourceTracker* GetResourceTracker() OVERRIDE; - virtual VarTracker* GetVarTracker() OVERRIDE; - - // Getters for the plugin-specific versions. - PluginResourceTracker* plugin_resource_tracker() { - return &plugin_resource_tracker_; - } - PluginVarTracker* plugin_var_tracker() { - return &plugin_var_tracker_; - } - - private: - static PluginGlobals* plugin_globals_; - - PluginResourceTracker plugin_resource_tracker_; - PluginVarTracker plugin_var_tracker_; - - DISALLOW_COPY_AND_ASSIGN(PluginGlobals); -}; - -} // namespace proxy -} // namespace ppapi - -#endif // PPAPI_PROXY_PLUGIN_GLOBALS_H_ -- cgit v1.1