PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_file_chooser_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_file_chooser_proxy.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
@@ skipping 28 matching lines @@
                     public PPB_FileChooser_API {
  public:
   FileChooser(const HostResource& resource);
   virtual ~FileChooser();
 
   // Resource overrides.
   virtual PPB_FileChooser_API* AsPPB_FileChooser_API() OVERRIDE;
 
   // PPB_FileChooser_API implementation.
   virtual int32_t Show(const PP_ArrayOutput& output,
-                       const PP_CompletionCallback& callback) OVERRIDE;
-  virtual int32_t ShowWithoutUserGesture(
-      PP_Bool save_as,
-      PP_Var suggested_file_name,
-      const PP_ArrayOutput& output,
-      const PP_CompletionCallback& callback);
-  virtual int32_t Show0_5(const PP_CompletionCallback& callback) OVERRIDE;
+                       ApiCallbackType callback) OVERRIDE;
+  virtual int32_t ShowWithoutUserGesture(PP_Bool save_as,
+                                         PP_Var suggested_file_name,
+                                         const PP_ArrayOutput& output,
+                                         ApiCallbackType callback);
+  virtual int32_t Show0_5(ApiCallbackType callback) OVERRIDE;
   virtual PP_Resource GetNextChosenFile() OVERRIDE;
-  virtual int32_t ShowWithoutUserGesture0_5(
-      PP_Bool save_as,
-      PP_Var suggested_file_name,
-      const PP_CompletionCallback& callback) OVERRIDE;
+  virtual int32_t ShowWithoutUserGesture0_5(PP_Bool save_as,
+                                            PP_Var suggested_file_name,
+                                            ApiCallbackType callback) OVERRIDE;
 
   // Handles the choose complete notification from the host.
   void ChooseComplete(
     int32_t result_code,
     const std::vector<PPB_FileRef_CreateInfo>& chosen_files);
 
  private:
   int32_t Show(bool require_user_gesture,
                PP_Bool save_as,
                PP_Var suggested_file_name,
-               const PP_CompletionCallback& callback);
+               ApiCallbackType callback);
 
   // When using v0.6 of the API, contains the array output info.
   ArrayWriter output_;
 
   scoped_refptr<TrackedCallback> current_show_callback_;
 
   // When using v0.5 of the API, contains all files returned by the current
   // show callback that haven't yet been given to the plugin. The plugin will
   // repeatedly call us to get the next file, and we'll vend those out of this
   // queue, removing them when ownership has transferred to the plugin.
@@ skipping 14 matching lines @@
     tracker->ReleaseResource(file_queue_.front());
     file_queue_.pop();
   }
 }
 
 PPB_FileChooser_API* FileChooser::AsPPB_FileChooser_API() {
   return this;
 }
 
 int32_t FileChooser::Show(const PP_ArrayOutput& output,
-                          const PP_CompletionCallback& callback) {
+                          ApiCallbackType callback) {
   int32_t result = Show(true, PP_FALSE, PP_MakeUndefined(), callback);
   if (result == PP_OK_COMPLETIONPENDING)
     output_.set_pp_array_output(output);
   return result;
 }
 
-int32_t FileChooser::ShowWithoutUserGesture(
-    PP_Bool save_as,
-    PP_Var suggested_file_name,
-    const PP_ArrayOutput& output,
-    const PP_CompletionCallback& callback) {
+int32_t FileChooser::ShowWithoutUserGesture(PP_Bool save_as,
+                                            PP_Var suggested_file_name,
+                                            const PP_ArrayOutput& output,
+                                            ApiCallbackType callback) {
   int32_t result = Show(false, save_as, PP_MakeUndefined(), callback);
   if (result == PP_OK_COMPLETIONPENDING)
     output_.set_pp_array_output(output);
   return result;
 }
 
-int32_t FileChooser::Show0_5(const PP_CompletionCallback& callback) {
+int32_t FileChooser::Show0_5(ApiCallbackType callback) {
   return Show(true, PP_FALSE, PP_MakeUndefined(), callback);
 }
 
-int32_t FileChooser::ShowWithoutUserGesture0_5(
-    PP_Bool save_as,
-    PP_Var suggested_file_name,
-    const PP_CompletionCallback& callback) {
+int32_t FileChooser::ShowWithoutUserGesture0_5(PP_Bool save_as,
+                                               PP_Var suggested_file_name,
+                                               ApiCallbackType callback) {
   return Show(false, save_as, suggested_file_name, callback);
 }
 
 int32_t FileChooser::Show(bool require_user_gesture,
                           PP_Bool save_as,
                           PP_Var suggested_file_name,
-                          const PP_CompletionCallback& callback) {
-  if (!callback.func)
-    return PP_ERROR_BLOCKS_MAIN_THREAD;
-
+                          ApiCallbackType callback) {
   if (TrackedCallback::IsPending(current_show_callback_))
     return PP_ERROR_INPROGRESS;  // Can't show more than once.
 
-  current_show_callback_ = new TrackedCallback(this, callback);
+  current_show_callback_ = callback;
   PluginDispatcher* dispatcher = PluginDispatcher::GetForResource(this);
   dispatcher->Send(
       new PpapiHostMsg_PPBFileChooser_Show(
           API_ID_PPB_FILE_CHOOSER,
           host_resource(),
           save_as,
           SerializedVarSendInput(dispatcher, suggested_file_name),
           require_user_gesture));
   return PP_OK_COMPLETIONPENDING;
 }
@@ skipping 149 matching lines @@
       files.push_back(cur_create_info);
     }
   }
 
   dispatcher()->Send(new PpapiMsg_PPBFileChooser_ChooseComplete(
       API_ID_PPB_FILE_CHOOSER, chooser, result, files));
 }
 
 }  // namespace proxy
 }  // namespace ppapi