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

ppapi/proxy/ppb_video_decoder_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_video_decoder_proxy.h"
 
 #include "base/logging.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_buffer_proxy.h"
 #include "ppapi/proxy/ppb_context_3d_proxy.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_Buffer_API;
 using ppapi::thunk::PPB_Context3D_API;
 using ppapi::thunk::PPB_VideoDecoder_API;
 
 namespace pp {
 namespace proxy {
 
-class VideoDecoder : public PluginResource,
+class VideoDecoder : public Resource,
                      public ::ppapi::VideoDecoderImpl {
  public:
+  // You must call Init() before using this class.
+  explicit VideoDecoder(const HostResource& resource);
   virtual ~VideoDecoder();
 
   static VideoDecoder* Create(const HostResource& resource,
                               PP_Resource context3d_id,
                               const PP_VideoConfigElement* config);
 
-  // ResourceObjectBase overrides.
+  // Resource overrides.
   virtual PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
 
   // PPB_VideoDecoder_API implementation.
   virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
                          PP_CompletionCallback callback) OVERRIDE;
   virtual void AssignPictureBuffers(
       uint32_t no_of_buffers, const PP_PictureBuffer_Dev* buffers) OVERRIDE;
   virtual void ReusePictureBuffer(int32_t picture_buffer_id) OVERRIDE;
   virtual int32_t Flush(PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Reset(PP_CompletionCallback callback) OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
- protected:
-  virtual void AddRefResource(PP_Resource resource) OVERRIDE;
-  virtual void UnrefResource(PP_Resource resource) OVERRIDE;
-
  private:
   friend class PPB_VideoDecoder_Proxy;
-  explicit VideoDecoder(const HostResource& resource);
+
+  PluginDispatcher* GetDispatcher() const;
 
   // Run the callbacks that were passed into the plugin interface.
   void FlushACK(int32_t result);
   void ResetACK(int32_t result);
   void EndOfBitstreamACK(int32_t buffer_id, int32_t result);
 
   DISALLOW_COPY_AND_ASSIGN(VideoDecoder);
 };
 
-VideoDecoder::VideoDecoder(const HostResource& decoder)
-    : PluginResource(decoder) {
-}
-
-VideoDecoder* VideoDecoder::Create(const HostResource& resource,
-                                   PP_Resource context3d_id,
-                                   const PP_VideoConfigElement* config) {
-  if (!context3d_id)
-    return NULL;
-
-  EnterResourceNoLock<PPB_Context3D_API> enter_context(context3d_id, true);
-  if (enter_context.failed())
-    return NULL;
-
-  scoped_refptr<VideoDecoder> decoder(new VideoDecoder(resource));
-  if (decoder->Init(context3d_id, enter_context.object(), config))
-    return decoder.release();
-  return NULL;
+VideoDecoder::VideoDecoder(const HostResource& decoder) : Resource(decoder) {
 }
 
 VideoDecoder::~VideoDecoder() {
 }
 
 ::ppapi::thunk::PPB_VideoDecoder_API* VideoDecoder::AsPPB_VideoDecoder_API() {
   return this;
 }
 
 int32_t VideoDecoder::Decode(
@@ skipping 55 matching lines @@
   return PP_OK_COMPLETIONPENDING;
 }
 
 void VideoDecoder::Destroy() {
   FlushCommandBuffer();
   GetDispatcher()->Send(new PpapiHostMsg_PPBVideoDecoder_Destroy(
       INTERFACE_ID_PPB_VIDEO_DECODER_DEV, host_resource()));
   ::ppapi::VideoDecoderImpl::Destroy();
 }
 
-void VideoDecoder::AddRefResource(PP_Resource resource) {
-  PluginResourceTracker::GetInstance()->AddRefResource(resource);
-}
-
-void VideoDecoder::UnrefResource(PP_Resource resource) {
-  PluginResourceTracker::GetInstance()->ReleaseResource(resource);
+PluginDispatcher* VideoDecoder::GetDispatcher() const {
+  return PluginDispatcher::GetForResource(this);
 }
 
 void VideoDecoder::ResetACK(int32_t result) {
   RunResetCallback(result);
 }
 
 void VideoDecoder::FlushACK(int32_t result) {
   RunFlushCallback(result);
 }
 
@@ skipping 76 matching lines @@
       static_cast<Context3D*>(enter_context.object());
   HostResource host_context = ppb_context->host_resource();
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBVideoDecoder_Create(
       INTERFACE_ID_PPB_VIDEO_DECODER_DEV, instance,
       host_context, copied, &result));
   if (result.is_null())
     return 0;
 
-  return PluginResourceTracker::GetInstance()->AddResource(
-      VideoDecoder::Create(result, context3d_id, config));
+  scoped_refptr<VideoDecoder> decoder(new VideoDecoder(result));

[dmichael (off chromium), 2011/08/17 19:02:54]

Why are you using scoped_refptr here but not elsewhere? Please either change it
to match the others, or if this is necessary here, add a comment explaining why.

+  if (!decoder->Init(context3d_id, enter_context.object(), config))
+    return 0;
+  return decoder->GetReference();
 }
 
 void PPB_VideoDecoder_Proxy::OnMsgCreate(
     PP_Instance instance, const HostResource& context3d_id,
     const std::vector<PP_VideoConfigElement>& config,
     HostResource* result) {
   ::ppapi::thunk::EnterFunction< ::ppapi::thunk::ResourceCreationAPI>
       resource_creation(instance, true);
   if (resource_creation.failed())
     return;
@@ skipping 86 matching lines @@
 
 void PPB_VideoDecoder_Proxy::OnMsgResetACK(
     const HostResource& decoder, int32_t result) {
   EnterPluginFromHostResource<PPB_VideoDecoder_API> enter(decoder);
   if (enter.succeeded())
     static_cast<VideoDecoder*>(enter.object())->ResetACK(result);
 }
 
 }  // namespace proxy
 }  // namespace pp