PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_audio_input_proxy.cc

 // 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_audio_input_proxy.h"
 
 #include "base/compiler_specific.h"
 #include "ppapi/c/dev/ppb_audio_input_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_audio_config.h"
@@ skipping 15 matching lines @@
 
 namespace ppapi {
 namespace proxy {
 
 class AudioInput : public PPB_AudioInput_Shared {
  public:
   explicit AudioInput(const HostResource& audio_input);
   virtual ~AudioInput();
 
   // Implementation of PPB_AudioInput_API trusted methods.
-  virtual int32_t OpenTrusted(
-      const std::string& device_id,
-      PP_Resource config,
-      const PP_CompletionCallback& create_callback) OVERRIDE;
+  virtual int32_t OpenTrusted(const std::string& device_id,
+                              PP_Resource config,
+                              ApiCallbackType create_callback) OVERRIDE;
   virtual int32_t GetSyncSocket(int* sync_socket) OVERRIDE;
   virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) OVERRIDE;
   virtual const std::vector<DeviceRefData>& GetDeviceRefData() const OVERRIDE;
 
  private:
   // PPB_AudioInput_Shared implementation.
-  virtual int32_t InternalEnumerateDevices(
-      PP_Resource* devices,
-      PP_CompletionCallback callback) OVERRIDE;
+  virtual int32_t InternalEnumerateDevices(PP_Resource* devices,
+                                           ApiCallbackType callback) OVERRIDE;
   virtual int32_t InternalOpen(const std::string& device_id,
                                PP_AudioSampleRate sample_rate,
                                uint32_t sample_frame_count,
-                               PP_CompletionCallback callback) OVERRIDE;
+                               ApiCallbackType callback) OVERRIDE;
   virtual PP_Bool InternalStartCapture() OVERRIDE;
   virtual PP_Bool InternalStopCapture() OVERRIDE;
   virtual void InternalClose() OVERRIDE;
 
   PluginDispatcher* GetDispatcher() const {
     return PluginDispatcher::GetForResource(this);
   }
 
   DISALLOW_COPY_AND_ASSIGN(AudioInput);
 };
 
 AudioInput::AudioInput(const HostResource& audio_input)
     : PPB_AudioInput_Shared(audio_input) {
 }
 
 AudioInput::~AudioInput() {
   Close();
 }
 
 int32_t AudioInput::OpenTrusted(const std::string& device_id,
                                 PP_Resource config,
-                                const PP_CompletionCallback& create_callback) {
+                                ApiCallbackType create_callback) {
   return PP_ERROR_NOTSUPPORTED;  // Don't proxy the trusted interface.
 }
 
 int32_t AudioInput::GetSyncSocket(int* sync_socket) {
   return PP_ERROR_NOTSUPPORTED;  // Don't proxy the trusted interface.
 }
 
 int32_t AudioInput::GetSharedMemory(int* shm_handle, uint32_t* shm_size) {
   return PP_ERROR_NOTSUPPORTED;  // Don't proxy the trusted interface.
 }
 
 const std::vector<DeviceRefData>& AudioInput::GetDeviceRefData() const {
   // Don't proxy the trusted interface.
   static std::vector<DeviceRefData> result;
   return result;
 }
 
 int32_t AudioInput::InternalEnumerateDevices(PP_Resource* devices,
-                                             PP_CompletionCallback callback) {
+                                             ApiCallbackType callback) {
   devices_ = devices;
-  enumerate_devices_callback_ = new TrackedCallback(this, callback);
+  enumerate_devices_callback_ = callback;
   GetDispatcher()->Send(new PpapiHostMsg_PPBAudioInput_EnumerateDevices(
       API_ID_PPB_AUDIO_INPUT_DEV, host_resource()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t AudioInput::InternalOpen(const std::string& device_id,
                                  PP_AudioSampleRate sample_rate,
                                  uint32_t sample_frame_count,
-                                 PP_CompletionCallback callback) {
-  open_callback_ = new TrackedCallback(this, callback);
+                                 ApiCallbackType callback) {
+  open_callback_ = callback;
   GetDispatcher()->Send(new PpapiHostMsg_PPBAudioInput_Open(
       API_ID_PPB_AUDIO_INPUT_DEV, host_resource(), device_id, sample_rate,
       sample_frame_count));
   return PP_OK_COMPLETIONPENDING;
 }
 
 PP_Bool AudioInput::InternalStartCapture() {
   SetStartCaptureState();
   GetDispatcher()->Send(new PpapiHostMsg_PPBAudioInput_StartOrStop(
       API_ID_PPB_AUDIO_INPUT_DEV, host_resource(), true));
@@ skipping 31 matching lines @@
     return 0;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBAudioInput_Create(
       API_ID_PPB_AUDIO_INPUT_DEV, instance, &result));
   if (result.is_null())
     return 0;
 
   AudioInput* audio_input = new AudioInput(result);
   int32_t open_result = audio_input->Open("", config, audio_input_callback,
-      user_data, AudioInput::MakeIgnoredCompletionCallback());
+      user_data, AudioInput::MakeIgnoredCompletionCallback(audio_input));
   if (open_result != PP_OK && open_result != PP_OK_COMPLETIONPENDING) {
     delete audio_input;
     return 0;
   }
   return audio_input->GetReference();
 }
 
 // static
 PP_Resource PPB_AudioInput_Proxy::CreateProxyResource(
     PP_Instance instance) {
@@ skipping 199 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 ppapi