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

Unified Diff: ppapi/thunk/ppb_video_decoder_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_decoder_api.h ('k') | ppapi/thunk/ppb_websocket_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_video_decoder_thunk.cc
diff --git a/ppapi/thunk/ppb_video_decoder_thunk.cc b/ppapi/thunk/ppb_video_decoder_thunk.cc
index 594b3366c744e31481eea54da7ad0357d2863a38..2472d8ab321f641e3327deaa78150640b42c5955 100644
--- a/ppapi/thunk/ppb_video_decoder_thunk.cc
+++ b/ppapi/thunk/ppb_video_decoder_thunk.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "ppapi/c/pp_errors.h"
+#include "ppapi/shared_impl/tracked_callback.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/thunk.h"
#include "ppapi/thunk/ppb_video_decoder_api.h"
@@ -35,7 +36,8 @@ int32_t Decode(PP_Resource video_decoder,
EnterVideoDecoder enter(video_decoder, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Decode(bitstream_buffer, callback));
+ return enter.SetResult(enter.object()->Decode(bitstream_buffer,
+ enter.callback()));
}
void AssignPictureBuffers(PP_Resource video_decoder,
@@ -56,7 +58,7 @@ int32_t Flush(PP_Resource video_decoder, PP_CompletionCallback callback) {
EnterVideoDecoder enter(video_decoder, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Flush(callback));
+ return enter.SetResult(enter.object()->Flush(enter.callback()));
}
int32_t Reset(PP_Resource video_decoder,
@@ -64,7 +66,7 @@ int32_t Reset(PP_Resource video_decoder,
EnterVideoDecoder enter(video_decoder, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Reset(callback));
+ return enter.SetResult(enter.object()->Reset(enter.callback()));
}
void Destroy(PP_Resource video_decoder) {
« no previous file with comments | « ppapi/thunk/ppb_video_decoder_api.h ('k') | ppapi/thunk/ppb_websocket_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698