Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1071)

Unified Diff: ppapi/thunk/ppb_video_capture_thunk.cc

Issue 10081020: PPAPI: Make blocking completion callbacks work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: export AssertLockHeld Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/thunk/ppb_video_capture_api.h ('k') | ppapi/thunk/ppb_video_decoder_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_video_capture_thunk.cc
diff --git a/ppapi/thunk/ppb_video_capture_thunk.cc b/ppapi/thunk/ppb_video_capture_thunk.cc
index 2471446ec579d09695d700343072dfe7f4147703..54cb68c4c732ca6149d29b9ec86ea23ace528cd3 100644
--- a/ppapi/thunk/ppb_video_capture_thunk.cc
+++ b/ppapi/thunk/ppb_video_capture_thunk.cc
@@ -4,6 +4,7 @@
#include "ppapi/c/pp_errors.h"
#include "ppapi/shared_impl/ppb_device_ref_shared.h"
+#include "ppapi/shared_impl/tracked_callback.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_device_ref_api.h"
#include "ppapi/thunk/ppb_video_capture_api.h"
@@ -36,7 +37,8 @@ int32_t EnumerateDevices(PP_Resource video_capture,
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->EnumerateDevices(devices, callback));
+ return enter.SetResult(enter.object()->EnumerateDevices(devices,
+ enter.callback()));
}
int32_t Open(PP_Resource video_capture,
@@ -59,7 +61,7 @@ int32_t Open(PP_Resource video_capture,
}
return enter.SetResult(enter.object()->Open(
- device_id, *requested_info, buffer_count, callback));
+ device_id, *requested_info, buffer_count, enter.callback()));
}
int32_t StartCapture(PP_Resource video_capture) {
« no previous file with comments | « ppapi/thunk/ppb_video_capture_api.h ('k') | ppapi/thunk/ppb_video_decoder_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698