| Index: ppapi/thunk/enter.h
|
| diff --git a/ppapi/thunk/enter.h b/ppapi/thunk/enter.h
|
| index 34fb706a5ba30c913aec660179b03f54ab38036e..faa556d9a2754326797a4246ab52b4bb7f91031a 100644
|
| --- a/ppapi/thunk/enter.h
|
| +++ b/ppapi/thunk/enter.h
|
| @@ -9,10 +9,11 @@
|
| #include "ppapi/c/pp_resource.h"
|
| #include "ppapi/proxy/interface_id.h"
|
| #include "ppapi/shared_impl/function_group_base.h"
|
| +#include "ppapi/shared_impl/ppapi_globals.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/resource_tracker.h"
|
| +#include "ppapi/shared_impl/tracker_base.h"
|
| #include "ppapi/thunk/ppapi_thunk_export.h"
|
| #include "ppapi/thunk/ppb_instance_api.h"
|
| #include "ppapi/thunk/resource_creation_api.h"
|
| @@ -116,7 +117,7 @@ class EnterFunctionGivenResource : public EnterFunction<FunctionsT> {
|
| private:
|
| static PP_Instance GetInstanceForResource(PP_Resource resource) {
|
| Resource* object =
|
| - TrackerBase::Get()->GetResourceTracker()->GetResource(resource);
|
| + PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
|
| return object ? object->pp_instance() : 0;
|
| }
|
| };
|
| @@ -128,7 +129,8 @@ class EnterResource : subtle::LockOnEntry<lock_on_entry> {
|
| public:
|
| EnterResource(PP_Resource resource, bool report_error)
|
| : object_(NULL) {
|
| - resource_ = TrackerBase::Get()->GetResourceTracker()->GetResource(resource);
|
| + resource_ =
|
| + PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
|
| if (resource_)
|
| object_ = resource_->GetAs<ResourceT>();
|
| // TODO(brettw) check error and if report_error is set, do something.
|
|
|