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

ppapi/proxy/ppb_audio_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_audio_proxy.h"
 
 #include "base/compiler_specific.h"
 #include "base/threading/simple_thread.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/interface_id.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
-#include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/audio_impl.h"
+#include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::HostResource;
+using ppapi::Resource;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Audio_API;
 using ppapi::thunk::PPB_AudioConfig_API;
 
 namespace pp {
 namespace proxy {
 
-class Audio : public PluginResource, public ppapi::AudioImpl {
+class Audio : public Resource, public ppapi::AudioImpl {
  public:
   Audio(const HostResource& audio_id,
         PP_Resource config_id,
         PPB_Audio_Callback callback,
         void* user_data);
   virtual ~Audio();
 
-  // ResourceObjectBase overrides.
+  // Resource overrides.
   virtual PPB_Audio_API* AsPPB_Audio_API();
 
   // PPB_Audio_API implementation.
   virtual PP_Resource GetCurrentConfig() OVERRIDE;
   virtual PP_Bool StartPlayback() OVERRIDE;
   virtual PP_Bool StopPlayback() OVERRIDE;
   virtual int32_t OpenTrusted(PP_Resource config_id,
                               PP_CompletionCallback create_callback) OVERRIDE;
   virtual int32_t GetSyncSocket(int* sync_socket) OVERRIDE;
   virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) OVERRIDE;
 
  private:
   // Owning reference to the current config object. This isn't actually used,
   // we just dish it out as requested by the plugin.
   PP_Resource config_;
 
   DISALLOW_COPY_AND_ASSIGN(Audio);
 };
 
 Audio::Audio(const HostResource& audio_id,
              PP_Resource config_id,
              PPB_Audio_Callback callback,
              void* user_data)
-    : PluginResource(audio_id),
+    : Resource(audio_id),
       config_(config_id) {
   SetCallback(callback, user_data);
   PluginResourceTracker::GetInstance()->AddRefResource(config_);
 }
 
 Audio::~Audio() {
   PluginResourceTracker::GetInstance()->ReleaseResource(config_);
 }
 
 PPB_Audio_API* Audio::AsPPB_Audio_API() {
   return this;
 }
 
 PP_Resource Audio::GetCurrentConfig() {
   // AddRef for the caller.
   PluginResourceTracker::GetInstance()->AddRefResource(config_);
   return config_;
 }
 
 PP_Bool Audio::StartPlayback() {
   if (playing())
     return PP_TRUE;
   SetStartPlaybackState();
-  PluginDispatcher::GetForInstance(instance())->Send(
+  PluginDispatcher::GetForInstance(pp_instance())->Send(

[dmichael (off chromium), 2011/08/17 21:35:51]

Sorry, didn't mean to imply that I marked all the places that could use
GetForResource. This is another.

       new PpapiHostMsg_PPBAudio_StartOrStop(
           INTERFACE_ID_PPB_AUDIO, host_resource(), true));
   return PP_TRUE;
 }
 
 PP_Bool Audio::StopPlayback() {
   if (!playing())
     return PP_TRUE;
-  PluginDispatcher::GetForInstance(instance())->Send(
+  PluginDispatcher::GetForInstance(pp_instance())->Send(

[dmichael (off chromium), 2011/08/17 21:35:51]

ditto

       new PpapiHostMsg_PPBAudio_StartOrStop(
           INTERFACE_ID_PPB_AUDIO, host_resource(), false));
   SetStopPlaybackState();
   return PP_TRUE;
 }
 
 int32_t Audio::OpenTrusted(PP_Resource config_id,
                            PP_CompletionCallback create_callback) {
   return PP_ERROR_NOTSUPPORTED;  // Don't proxy the trusted interface.
 }
@@ skipping 63 matching lines @@
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBAudio_Create(
       INTERFACE_ID_PPB_AUDIO, instance_id,
       config.object()->GetSampleRate(), config.object()->GetSampleFrameCount(),
       &result));
   if (result.is_null())
     return 0;
 
-  return PluginResourceTracker::GetInstance()->AddResource(
-      new Audio(result, config_id, audio_callback, user_data));
+  return (new Audio(result, config_id,
+                    audio_callback, user_data))->GetReference();
 }
 
 bool PPB_Audio_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Audio_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBAudio_Create, OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBAudio_StartOrStop,
                         OnMsgStartOrStop)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBAudio_NotifyAudioStreamCreated,
                         OnMsgNotifyAudioStreamCreated)
@@ skipping 141 matching lines @@
   *foreign_shared_memory_handle = dispatcher()->ShareHandleWithRemote(
       IntToPlatformFile(shared_memory_handle), false);
   if (*foreign_shared_memory_handle == IPC::InvalidPlatformFileForTransit())
     return PP_ERROR_FAILED;
 
   return PP_OK;
 }
 
 }  // namespace proxy
 }  // namespace pp