Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: ppapi/shared_impl/resource.cc

Issue 8342016: Revert 106142 - Add a new globals object for PPAPI tracking information. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/shared_impl/ppapi_globals.cc ('k') | ppapi/shared_impl/resource_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/resource.cc
===================================================================
--- ppapi/shared_impl/resource.cc (revision 106146)
+++ ppapi/shared_impl/resource.cc (working copy)
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "ppapi/shared_impl/resource_tracker.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
+#include "ppapi/shared_impl/tracker_base.h"
namespace ppapi {
@@ -20,21 +20,21 @@
// the host resource, so we need to fill that first even though we don't
// have a resource ID yet, then fill the resource in later.
host_resource_ = HostResource::MakeInstanceOnly(instance);
- pp_resource_ = PpapiGlobals::Get()->GetResourceTracker()->AddResource(this);
+ pp_resource_ = TrackerBase::Get()->GetResourceTracker()->AddResource(this);
host_resource_.SetHostResource(instance, pp_resource_);
}
Resource::Resource(const HostResource& host_resource)
: host_resource_(host_resource) {
- pp_resource_ = PpapiGlobals::Get()->GetResourceTracker()->AddResource(this);
+ pp_resource_ = TrackerBase::Get()->GetResourceTracker()->AddResource(this);
}
Resource::~Resource() {
- PpapiGlobals::Get()->GetResourceTracker()->RemoveResource(this);
+ TrackerBase::Get()->GetResourceTracker()->RemoveResource(this);
}
PP_Resource Resource::GetReference() {
- PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(pp_resource());
+ TrackerBase::Get()->GetResourceTracker()->AddRefResource(pp_resource());
return pp_resource();
}
« no previous file with comments | « ppapi/shared_impl/ppapi_globals.cc ('k') | ppapi/shared_impl/resource_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698