PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_flash_menu_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_flash_menu_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/webmenuitem.h"
 #include "webkit/plugins/ppapi/common.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::thunk::PPB_Flash_Menu_API;
 using ppapi::TrackedCallback;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Maximum depth of submenus allowed (e.g., 1 indicates that submenus are
 // allowed, but not sub-submenus).
@@ skipping 96 matching lines @@
 
   return true;
 }
 
 PPB_Flash_Menu_API* PPB_Flash_Menu_Impl::AsPPB_Flash_Menu_API() {
   return this;
 }
 
 int32_t PPB_Flash_Menu_Impl::Show(const PP_Point* location,
                                   int32_t* selected_id_out,
-                                  PP_CompletionCallback callback) {
+                                  ApiCallbackType callback) {
   // |location| is not (currently) optional.
   // TODO(viettrungluu): Make it optional and default to the current mouse pos?
   if (!location)
     return PP_ERROR_BADARGUMENT;
 
-  if (!callback.func)
-    return PP_ERROR_BLOCKS_MAIN_THREAD;
-
   if (TrackedCallback::IsPending(callback_))
     return PP_ERROR_INPROGRESS;
 
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return false;
 
   int32_t rv = plugin_instance->delegate()->ShowContextMenu(
       plugin_instance, this, gfx::Point(location->x, location->y));
   if (rv == PP_OK_COMPLETIONPENDING) {
     // Record callback and output buffers.
-    callback_ = new TrackedCallback(this, callback);
+    callback_ = callback;
     selected_id_out_ = selected_id_out;
   } else {
     // This should never be completed synchronously successfully.
     DCHECK_NE(rv, PP_OK);
   }
   return rv;
-
-  NOTIMPLEMENTED();
-  return PP_ERROR_FAILED;
 }
 
 void PPB_Flash_Menu_Impl::CompleteShow(int32_t result,
                                        unsigned action) {
   int32_t rv = PP_ERROR_ABORTED;
   if (!callback_->aborted()) {
     CHECK(!callback_->completed());
     rv = result;
 
     // Write output data.
     if (selected_id_out_ && result == PP_OK) {
       // We reserved action 0 to be invalid.
       if (action == 0 || action >= menu_id_map_.size()) {
         NOTREACHED() << "Invalid action received.";
         rv = PP_ERROR_FAILED;
       } else {
         *selected_id_out_ = menu_id_map_[action];
       }
     }
   }
 
   selected_id_out_ = NULL;
   TrackedCallback::ClearAndRun(&callback_, rv);
 }
 
 }  // namespace ppapi
 }  // namespace webkit