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

Unified Diff: ppapi/thunk/ppb_transport_thunk.cc

Issue 10081020: PPAPI: Make blocking completion callbacks work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 8 years, 7 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
Index: ppapi/thunk/ppb_transport_thunk.cc
diff --git a/ppapi/thunk/ppb_transport_thunk.cc b/ppapi/thunk/ppb_transport_thunk.cc
index d739e89ea3ff02fcc862c7330ae60c4bdccc8d98..d091176fe8d218b1ba5a053cf979f22673f6cf16 100644
--- a/ppapi/thunk/ppb_transport_thunk.cc
+++ b/ppapi/thunk/ppb_transport_thunk.cc
@@ -4,6 +4,7 @@
#include "ppapi/c/pp_completion_callback.h"
#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_transport_api.h"
@@ -48,7 +49,7 @@ int32_t Connect(PP_Resource transport, PP_CompletionCallback callback) {
EnterTransport enter(transport, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Connect(callback));
+ return enter.SetResult(enter.object()->Connect(enter.callback()));
}
int32_t GetNextAddress(PP_Resource transport, PP_Var* address,
@@ -56,7 +57,8 @@ int32_t GetNextAddress(PP_Resource transport, PP_Var* address,
EnterTransport enter(transport, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->GetNextAddress(address, callback));
+ return enter.SetResult(enter.object()->GetNextAddress(address,
+ enter.callback()));
}
int32_t ReceiveRemoteAddress(PP_Resource transport, PP_Var address) {
@@ -71,7 +73,7 @@ int32_t Recv(PP_Resource transport, void* data, uint32_t len,
EnterTransport enter(transport, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Recv(data, len, callback));
+ return enter.SetResult(enter.object()->Recv(data, len, enter.callback()));
}
int32_t Send(PP_Resource transport, const void* data, uint32_t len,
@@ -79,7 +81,7 @@ int32_t Send(PP_Resource transport, const void* data, uint32_t len,
EnterTransport enter(transport, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Send(data, len, callback));
+ return enter.SetResult(enter.object()->Send(data, len, enter.callback()));
}
int32_t Close(PP_Resource transport) {

Powered by Google App Engine
This is Rietveld 408576698