PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_file_chooser_impl.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 "webkit/plugins/ppapi/ppb_file_chooser_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
+using ppapi::ApiCallbackType;
 using ppapi::StringVar;
 using ppapi::thunk::PPB_FileChooser_API;
 using ppapi::TrackedCallback;
 using WebKit::WebCString;
 using WebKit::WebFileChooserCompletion;
 using WebKit::WebFileChooserParams;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 namespace webkit {
@@ skipping 100 matching lines @@
   }
 
   int32_t result_code = (chosen_files.size() > 0) ? PP_OK : PP_ERROR_USERCANCEL;
   if (output_.is_valid())
     output_.StoreResourceVector(chosen_files);
   else  // v0.5 API.
     chosen_files_.swap(chosen_files);
   RunCallback(result_code);
 }
 
-int32_t PPB_FileChooser_Impl::ValidateCallback(
-    const PP_CompletionCallback& callback) {
-  // We only support non-blocking calls.
-  if (!callback.func)
-    return PP_ERROR_BLOCKS_MAIN_THREAD;
-
+int32_t PPB_FileChooser_Impl::ValidateCallback(ApiCallbackType callback) {
   if (TrackedCallback::IsPending(callback_))
     return PP_ERROR_INPROGRESS;
 
   return PP_OK;
 }
 
-void PPB_FileChooser_Impl::RegisterCallback(
-    const PP_CompletionCallback& callback) {
-  DCHECK(callback.func);
+void PPB_FileChooser_Impl::RegisterCallback(ApiCallbackType callback) {
   DCHECK(!TrackedCallback::IsPending(callback_));
 
   PluginModule* plugin_module = ResourceHelper::GetPluginModule(this);
   if (!plugin_module)
     return;
 
-  callback_ = new TrackedCallback(this, callback);
+  callback_ = callback;
 }
 
 void PPB_FileChooser_Impl::RunCallback(int32_t result) {
   TrackedCallback::ClearAndRun(&callback_, result);
 }
 
 int32_t PPB_FileChooser_Impl::Show(const PP_ArrayOutput& output,
-                                   const PP_CompletionCallback& callback) {
+                                   ApiCallbackType callback) {
   int32_t result = Show0_5(callback);
   if (result == PP_OK_COMPLETIONPENDING)
     output_.set_pp_array_output(output);
   return result;
 }
 
 int32_t PPB_FileChooser_Impl::ShowWithoutUserGesture(
     PP_Bool save_as,
     PP_Var suggested_file_name,
     const PP_ArrayOutput& output,
-    const PP_CompletionCallback& callback) {
+    ApiCallbackType callback) {
   int32_t result = ShowWithoutUserGesture0_5(save_as, suggested_file_name,
                                              callback);
   if (result == PP_OK_COMPLETIONPENDING)
     output_.set_pp_array_output(output);
   return result;
 }
 
-int32_t PPB_FileChooser_Impl::Show0_5(const PP_CompletionCallback& callback) {
+int32_t PPB_FileChooser_Impl::Show0_5(ApiCallbackType callback) {
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return PP_ERROR_FAILED;
   if (!plugin_instance->IsProcessingUserGesture())
     return PP_ERROR_NO_USER_GESTURE;
   return ShowWithoutUserGesture0_5(PP_FALSE, PP_MakeUndefined(), callback);
 }
 
 int32_t PPB_FileChooser_Impl::ShowWithoutUserGesture0_5(
     PP_Bool save_as,
     PP_Var suggested_file_name,
-    const PP_CompletionCallback& callback) {
+    ApiCallbackType callback) {
   int32_t rv = ValidateCallback(callback);
   if (rv != PP_OK)
     return rv;
 
   DCHECK((mode_ == PP_FILECHOOSERMODE_OPEN) ||
          (mode_ == PP_FILECHOOSERMODE_OPENMULTIPLE));
 
   WebFileChooserParams params;
   if (save_as) {
     params.saveAs = true;
@@ skipping 42 matching lines @@
       continue;
     StringToLowerASCII(&mime_type);
     normalized_mime_type_list.push_back(WebString::fromUTF8(mime_type.data(),
                                                             mime_type.size()));
   }
   return normalized_mime_type_list;
 }
 
 }  // namespace ppapi
 }  // namespace webkit