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

Unified Diff: ppapi/thunk/ppb_tcp_socket_private_thunk.cc

Issue 10081020: PPAPI: Make blocking completion callbacks work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated TestURLLoader to test blocking callbacks. Created 8 years, 8 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_tcp_socket_private_thunk.cc
diff --git a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
index bd9703e779f335678e6756ce2bf5ae9450638cb3..da51175bf30f2805c45da3f50c59c04b517e5f79 100644
--- a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
+++ b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
@@ -36,7 +36,7 @@ int32_t Connect(PP_Resource tcp_socket,
EnterTCP enter(tcp_socket, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Connect(host, port, callback));
+ return enter.SetResult(enter.object()->Connect(host, port, enter.callback()));
}
int32_t ConnectWithNetAddress(PP_Resource tcp_socket,
@@ -45,7 +45,8 @@ int32_t ConnectWithNetAddress(PP_Resource tcp_socket,
EnterTCP enter(tcp_socket, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->ConnectWithNetAddress(addr, callback));
+ return enter.SetResult(
+ enter.object()->ConnectWithNetAddress(addr, enter.callback()));
}
PP_Bool GetLocalAddress(PP_Resource tcp_socket,
@@ -72,7 +73,7 @@ int32_t SSLHandshake(PP_Resource tcp_socket,
if (enter.failed())
return enter.retval();
return enter.SetResult(enter.object()->SSLHandshake(server_name, server_port,
- callback));
+ enter.callback()));
}
PP_Resource GetServerCertificate(PP_Resource tcp_socket) {
@@ -98,7 +99,8 @@ int32_t Read(PP_Resource tcp_socket,
EnterTCP enter(tcp_socket, callback, true);
if (enter.failed())
return enter.retval();
- return enter.SetResult(enter.object()->Read(buffer, bytes_to_read, callback));
+ return enter.SetResult(enter.object()->Read(buffer, bytes_to_read,
+ enter.callback()));
}
int32_t Write(PP_Resource tcp_socket,
@@ -109,7 +111,7 @@ int32_t Write(PP_Resource tcp_socket,
if (enter.failed())
return enter.retval();
return enter.SetResult(enter.object()->Write(buffer, bytes_to_write,
- callback));
+ enter.callback()));
}
void Disconnect(PP_Resource tcp_socket) {

Powered by Google App Engine
This is Rietveld 408576698