Add a unified resource tracker shared between the proxy and the impl.

ppapi/proxy/ppb_file_ref_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_file_ref_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/private/ppb_proxy_private.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/thunk/ppb_file_ref_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::EnterFunctionNoLock;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_FileRef_API;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace pp {
 namespace proxy {
 
 namespace {
 
 InterfaceProxy* CreateFileRefProxy(Dispatcher* dispatcher,
                                    const void* target_interface) {
   return new PPB_FileRef_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
-class FileRef : public PluginResource, public PPB_FileRef_API {
+class FileRef : public Resource, public PPB_FileRef_API {
  public:
   explicit FileRef(const PPBFileRef_CreateInfo& info);
   virtual ~FileRef();
 
-  // ResourceObjectBase overrides.
+  // Resource overrides.
   virtual PPB_FileRef_API* AsPPB_FileRef_API() OVERRIDE;
 
   // PPB_FileRef_API implementation.
   virtual PP_FileSystemType GetFileSystemType() const OVERRIDE;
   virtual PP_Var GetName() const OVERRIDE;
   virtual PP_Var GetPath() const OVERRIDE;
   virtual PP_Resource GetParent() OVERRIDE;
   virtual int32_t MakeDirectory(PP_Bool make_ancestors,
                                 PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Touch(PP_Time last_access_time,
                         PP_Time last_modified_time,
                         PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Delete(PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Rename(PP_Resource new_file_ref,
                          PP_CompletionCallback callback) OVERRIDE;
 
  private:
+  PluginDispatcher* GetDispatcher() const {
+    return PluginDispatcher::GetForResource(this);
+  }
+
   PP_FileSystemType file_system_type_;
   PP_Var path_;
   PP_Var name_;
 
   DISALLOW_COPY_AND_ASSIGN(FileRef);
 };
 
 FileRef::FileRef(const PPBFileRef_CreateInfo& info)
-    : PluginResource(info.resource) {
-  Dispatcher* dispatcher = PluginDispatcher::GetForInstance(instance());
+    : Resource(info.resource) {
+  Dispatcher* dispatcher = PluginDispatcher::GetForInstance(pp_instance());
 
   file_system_type_ = static_cast<PP_FileSystemType>(info.file_system_type);
 
   name_ = ReceiveSerializedVarReturnValue(info.name).Return(dispatcher);
   path_ = ReceiveSerializedVarReturnValue(info.path).Return(dispatcher);
 }
 
 FileRef::~FileRef() {
   PluginVarTracker& var_tracker =
       PluginResourceTracker::GetInstance()->var_tracker();
@@ skipping 46 matching lines @@
 
 int32_t FileRef::Delete(PP_CompletionCallback callback) {
   GetDispatcher()->Send(new PpapiHostMsg_PPBFileRef_Delete(
       INTERFACE_ID_PPB_FILE_REF, host_resource(),
       GetDispatcher()->callback_tracker().SendCallback(callback)));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t FileRef::Rename(PP_Resource new_file_ref,
                         PP_CompletionCallback callback) {
-  PluginResource* new_file_ref_object =
-      PluginResourceTracker::GetInstance()->GetResourceObject(new_file_ref);
+  Resource* new_file_ref_object =
+      PluginResourceTracker::GetInstance()->GetResource(new_file_ref);
   if (!new_file_ref_object ||
-      new_file_ref_object->host_resource().instance() != instance())
+      new_file_ref_object->host_resource().instance() != pp_instance())
     return PP_ERROR_BADRESOURCE;
 
   GetDispatcher()->Send(new PpapiHostMsg_PPBFileRef_Rename(
       INTERFACE_ID_PPB_FILE_REF, host_resource(),
       new_file_ref_object->host_resource(),
       GetDispatcher()->callback_tracker().SendCallback(callback)));
   return PP_OK_COMPLETIONPENDING;
 }
 
 PPB_FileRef_Proxy::PPB_FileRef_Proxy(Dispatcher* dispatcher,
@@ skipping 11 matching lines @@
     INTERFACE_ID_PPB_FILE_REF,
     false,
     &CreateFileRefProxy,
   };
   return &info;
 }
 
 // static
 PP_Resource PPB_FileRef_Proxy::CreateProxyResource(PP_Resource file_system,
                                                    const char* path) {
-  PluginResource* file_system_object =
-      PluginResourceTracker::GetInstance()->GetResourceObject(file_system);
+  Resource* file_system_object =
+      PluginResourceTracker::GetInstance()->GetResource(file_system);
   if (!file_system_object)
     return 0;
 
   PPBFileRef_CreateInfo create_info;
-  file_system_object->GetDispatcher()->Send(new PpapiHostMsg_PPBFileRef_Create(
-      INTERFACE_ID_PPB_FILE_REF, file_system_object->host_resource(),
-      path, &create_info));
+  PluginDispatcher::GetForResource(file_system_object)->Send(
+      new PpapiHostMsg_PPBFileRef_Create(
+          INTERFACE_ID_PPB_FILE_REF, file_system_object->host_resource(),
+          path, &create_info));
   return PPB_FileRef_Proxy::DeserializeFileRef(create_info);
 }
 
 bool PPB_FileRef_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_FileRef_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileRef_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileRef_GetParent, OnMsgGetParent)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFileRef_MakeDirectory,
                         OnMsgMakeDirectory)
@@ skipping 30 matching lines @@
                                                    enter.object()->GetPath());
   result->name = SerializedVarReturnValue::Convert(dispatcher(),
                                                    enter.object()->GetName());
 }
 
 // static
 PP_Resource PPB_FileRef_Proxy::DeserializeFileRef(
     const PPBFileRef_CreateInfo& serialized) {
   if (serialized.resource.is_null())
     return 0;  // Resource invalid.
-
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new FileRef(serialized));
+  return (new FileRef(serialized))->GetReference();
 }
 
 void PPB_FileRef_Proxy::OnMsgCreate(const HostResource& file_system,
                                     const std::string& path,
                                     PPBFileRef_CreateInfo* result) {
   EnterFunctionNoLock<ResourceCreationAPI> enter(file_system.instance(), true);
   if (enter.failed())
     return;
   PP_Resource resource = enter.functions()->CreateFileRef(
       file_system.host_resource(), path.c_str());
@@ skipping 53 matching lines @@
     return;
   PP_CompletionCallback callback = ReceiveCallback(serialized_callback);
   int32_t result = enter.object()->Rename(new_file_ref.host_resource(),
                                           callback);
   if (result != PP_OK_COMPLETIONPENDING)
     PP_RunCompletionCallback(&callback, result);
 }
 
 }  // namespace proxy
 }  // namespace pp