PPAPI: Make blocking completion callbacks work.

webkit/plugins/ppapi/ppb_video_capture_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_video_capture_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/dev/pp_video_capture_dev.h"
 #include "ppapi/c/dev/ppb_video_capture_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
+using ppapi::ApiCallbackType;
 using ppapi::DeviceRefData;
 using ppapi::PpapiGlobals;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
 using ppapi::thunk::PPB_VideoCapture_API;
 using ppapi::TrackedCallback;
 
 namespace {
 
 // Maximum number of buffers to actually allocate.
@@ skipping 128 matching lines @@
 
 void PPB_VideoCapture_Impl::OnInitialized(media::VideoCapture* capture,
                                           bool succeeded) {
   DCHECK(capture == platform_video_capture_.get());
 
   OnOpenComplete(succeeded ? PP_OK : PP_ERROR_FAILED);
 }
 
 int32_t PPB_VideoCapture_Impl::InternalEnumerateDevices(
     PP_Resource* devices,
-    const PP_CompletionCallback& callback) {
+    ApiCallbackType callback) {
   PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
   if (!instance)
     return PP_ERROR_FAILED;
 
   devices_ = devices;
-  enumerate_devices_callback_ = new TrackedCallback(this, callback);
+  enumerate_devices_callback_ = callback;
   instance->delegate()->EnumerateDevices(
       PP_DEVICETYPE_DEV_VIDEOCAPTURE,
       base::Bind(&PPB_VideoCapture_Impl::EnumerateDevicesCallbackFunc,
                  AsWeakPtr()));
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PPB_VideoCapture_Impl::InternalOpen(
     const std::string& device_id,
     const PP_VideoCaptureDeviceInfo_Dev& requested_info,
     uint32_t buffer_count,
-    const PP_CompletionCallback& callback) {
+    ApiCallbackType callback) {
   // It is able to complete synchronously if the default device is used.
   bool sync_completion = device_id.empty();
 
-  if (!callback.func && !sync_completion)
-    return PP_ERROR_BLOCKS_MAIN_THREAD;
-
   PluginInstance* instance = ResourceHelper::GetPluginInstance(this);
   if (!instance)
     return PP_ERROR_FAILED;
 
   SetRequestedInfo(requested_info, buffer_count);
 
   DCHECK(!platform_video_capture_.get());
   platform_video_capture_ =
       instance->delegate()->CreateVideoCapture(device_id, this);
 
   if (sync_completion) {
     OnInitialized(platform_video_capture_.get(), true);
     return PP_OK;
   } else {
-    open_callback_ = new TrackedCallback(this, callback);
+    open_callback_ = callback;
     return PP_OK_COMPLETIONPENDING;
   }
 }
 
 int32_t PPB_VideoCapture_Impl::InternalStartCapture() {
   DCHECK(buffers_.empty());
   platform_video_capture_->StartCapture(this, capability_);
   return PP_OK;
 }
 
@@ skipping 92 matching lines @@
     : in_use(false),
       data(NULL),
       buffer() {
 }
 
 PPB_VideoCapture_Impl::BufferInfo::~BufferInfo() {
 }
 
 }  // namespace ppapi
 }  // namespace webkit