PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_video_decoder_proxy.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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"
@@ skipping 16 matching lines @@
   // You must call Init() before using this class.
   explicit VideoDecoder(const HostResource& resource);
   virtual ~VideoDecoder();
 
   static VideoDecoder* Create(const HostResource& resource,
                               PP_Resource graphics_context,
                               PP_VideoDecoder_Profile profile);
 
   // PPB_VideoDecoder_API implementation.
   virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
-                         PP_CompletionCallback callback) OVERRIDE;
+                         scoped_refptr<TrackedCallback> 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 int32_t Flush(scoped_refptr<TrackedCallback> callback) OVERRIDE;
+  virtual int32_t Reset(scoped_refptr<TrackedCallback> callback) OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
  private:
   friend class PPB_VideoDecoder_Proxy;
 
   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)
     : PPB_VideoDecoder_Shared(decoder) {
 }
 
 VideoDecoder::~VideoDecoder() {
 }
 
 int32_t VideoDecoder::Decode(
     const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
-    PP_CompletionCallback callback) {
+    scoped_refptr<TrackedCallback> callback) {
   EnterResourceNoLock<PPB_Buffer_API>
       enter_buffer(bitstream_buffer->data, true);
   if (enter_buffer.failed())
     return PP_ERROR_BADRESOURCE;
 
   if (!SetBitstreamBufferCallback(bitstream_buffer->id, callback))
     return PP_ERROR_BADARGUMENT;
 
   Buffer* ppb_buffer =
       static_cast<Buffer*>(enter_buffer.object());
@@ skipping 16 matching lines @@
       new PpapiHostMsg_PPBVideoDecoder_AssignPictureBuffers(
           API_ID_PPB_VIDEO_DECODER_DEV, host_resource(), buffer_list));
 }
 
 void VideoDecoder::ReusePictureBuffer(int32_t picture_buffer_id) {
   FlushCommandBuffer();
   GetDispatcher()->Send(new PpapiHostMsg_PPBVideoDecoder_ReusePictureBuffer(
       API_ID_PPB_VIDEO_DECODER_DEV, host_resource(), picture_buffer_id));
 }
 
-int32_t VideoDecoder::Flush(PP_CompletionCallback callback) {
+int32_t VideoDecoder::Flush(scoped_refptr<TrackedCallback> callback) {
   if (!SetFlushCallback(callback))
     return PP_ERROR_INPROGRESS;
 
   FlushCommandBuffer();
   GetDispatcher()->Send(new PpapiHostMsg_PPBVideoDecoder_Flush(
       API_ID_PPB_VIDEO_DECODER_DEV, host_resource()));
   return PP_OK_COMPLETIONPENDING;
 }
 
-int32_t VideoDecoder::Reset(PP_CompletionCallback callback) {
+int32_t VideoDecoder::Reset(scoped_refptr<TrackedCallback> callback) {
   if (!SetResetCallback(callback))
     return PP_ERROR_INPROGRESS;
 
   FlushCommandBuffer();
   GetDispatcher()->Send(new PpapiHostMsg_PPBVideoDecoder_Reset(
       API_ID_PPB_VIDEO_DECODER_DEV, host_resource()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 void VideoDecoder::Destroy() {
@@ skipping 180 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 ppapi