Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_audio_impl.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 "webkit/plugins/ppapi/ppb_audio_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
+#include "ppapi/shared_impl/resource_tracker.h"
+#include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/ppapi/common.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Audio_API;
 using ppapi::thunk::PPB_AudioConfig_API;
 
 namespace webkit {
 namespace ppapi {
 
 // PPB_AudioConfig -------------------------------------------------------------
 
-PPB_AudioConfig_Impl::PPB_AudioConfig_Impl(PluginInstance* instance)
+PPB_AudioConfig_Impl::PPB_AudioConfig_Impl(PP_Instance instance)
     : Resource(instance) {
 }
 
 PPB_AudioConfig_Impl::~PPB_AudioConfig_Impl() {
 }
 
 // static
-PP_Resource PPB_AudioConfig_Impl::Create(PluginInstance* instance,
+PP_Resource PPB_AudioConfig_Impl::Create(PP_Instance instance,
                                          PP_AudioSampleRate sample_rate,
                                          uint32_t sample_frame_count) {
   scoped_refptr<PPB_AudioConfig_Impl> config(
       new PPB_AudioConfig_Impl(instance));
   if (!config->Init(sample_rate, sample_frame_count))
     return 0;
   return config->GetReference();
 }
 
 PPB_AudioConfig_API* PPB_AudioConfig_Impl::AsPPB_AudioConfig_API() {
   return this;
 }
 
 // PPB_Audio_Impl --------------------------------------------------------------
 
-PPB_Audio_Impl::PPB_Audio_Impl(PluginInstance* instance)
+PPB_Audio_Impl::PPB_Audio_Impl(PP_Instance instance)
     : Resource(instance),
-      config_id_(0),
       audio_(NULL),
       create_callback_pending_(false),
       shared_memory_size_for_create_callback_(0) {
   create_callback_ = PP_MakeCompletionCallback(NULL, NULL);
 }
 
 PPB_Audio_Impl::~PPB_Audio_Impl() {
-  if (config_id_)
-    ResourceTracker::Get()->ReleaseResource(config_id_);
-
   // Calling ShutDown() makes sure StreamCreated cannot be called anymore and
   // releases the audio data associated with the pointer. Note however, that
   // until ShutDown returns, StreamCreated may still be called. This will be
   // OK since we'll just immediately clean up the data it stored later in this
   // destructor.
   if (audio_) {
     audio_->ShutDown();
     audio_ = NULL;
   }
 
   // If the completion callback hasn't fired yet, do so here
   // with an error condition.
   if (create_callback_pending_) {
     PP_RunCompletionCallback(&create_callback_, PP_ERROR_ABORTED);
     create_callback_pending_ = false;
   }
 }
 
 // static
-PP_Resource PPB_Audio_Impl::Create(PluginInstance* instance,
+PP_Resource PPB_Audio_Impl::Create(PP_Instance instance,
                                    PP_Resource config_id,

[viettrungluu, 2011/08/22 23:19:46]

I think you should rename s/config_id/config/.

                                    PPB_Audio_Callback audio_callback,
                                    void* user_data) {
   scoped_refptr<PPB_Audio_Impl> audio(new PPB_Audio_Impl(instance));
   if (!audio->Init(config_id, audio_callback, user_data))
     return 0;
   return audio->GetReference();
 }
 
 PPB_Audio_API* PPB_Audio_Impl::AsPPB_Audio_API() {
   return this;
 }
 
 bool PPB_Audio_Impl::Init(PP_Resource config_id,

[viettrungluu, 2011/08/22 23:19:46]

"

                           PPB_Audio_Callback callback, void* user_data) {
   // Validate the config and keep a reference to it.
   EnterResourceNoLock<PPB_AudioConfig_API> enter(config_id, true);
   if (enter.failed())
     return false;
-  config_id_ = config_id;
-  ResourceTracker::Get()->AddRefResource(config_id);
+  config_ = config_id;
 
   if (!callback)
     return false;
   SetCallback(callback, user_data);
 
   // When the stream is created, we'll get called back on StreamCreated().
   CHECK(!audio_);
-  audio_ = instance()->delegate()->CreateAudio(
+  audio_ = ResourceHelper::GetPluginDelegate(this)->CreateAudio(
       enter.object()->GetSampleRate(),
       enter.object()->GetSampleFrameCount(),
       this);
   return audio_ != NULL;
 }
 
 PP_Resource PPB_Audio_Impl::GetCurrentConfig() {
-  // AddRef on behalf of caller.
-  ResourceTracker::Get()->AddRefResource(config_id_);
-  return config_id_;
+  // AddRef on behalf of caller, while keeping a ref for ourselves.
+  ::ppapi::TrackerBase::Get()->GetResourceTracker()->AddRefResource(config_);
+  return config_;
 }
 
 PP_Bool PPB_Audio_Impl::StartPlayback() {
   if (!audio_)
     return PP_FALSE;
   if (playing())
     return PP_TRUE;
   SetStartPlaybackState();
   return BoolToPPBool(audio_->StartPlayback());
 }
 
 PP_Bool PPB_Audio_Impl::StopPlayback() {
   if (!audio_)
     return PP_FALSE;
   if (!playing())
     return PP_TRUE;
   if (!audio_->StopPlayback())
     return PP_FALSE;
   SetStopPlaybackState();
   return PP_TRUE;
 }
 
 int32_t PPB_Audio_Impl::OpenTrusted(PP_Resource config_id,

[viettrungluu, 2011/08/22 23:19:46]

"

                                     PP_CompletionCallback create_callback) {
 
   // Validate the config and keep a reference to it.
   EnterResourceNoLock<PPB_AudioConfig_API> enter(config_id, true);
   if (enter.failed())
     return false;
-  config_id_ = config_id;
-  ResourceTracker::Get()->AddRefResource(config_id);
+  config_ = config_id;
 
   // When the stream is created, we'll get called back on StreamCreated().
   DCHECK(!audio_);
-  audio_ = instance()->delegate()->CreateAudio(
+  audio_ = ResourceHelper::GetPluginDelegate(this)->CreateAudio(
       enter.object()->GetSampleRate(),
       enter.object()->GetSampleFrameCount(),
       this);
   if (!audio_)
     return PP_ERROR_FAILED;
 
   // At this point, we are guaranteeing ownership of the completion
   // callback.  Audio promises to fire the completion callback
   // once and only once.
   create_callback_ = create_callback;
@@ skipping 54 matching lines @@
     // something more elaborate like an ACK from the plugin or post a task to
     // the I/O thread and back, but this extra complexity doesn't seem worth it
     // just to clean up these handles faster.
   } else {
     SetStreamInfo(shared_memory_handle, shared_memory_size, socket_handle);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit