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

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc

Issue 9802027: WebSocket Pepper API: synchronous completion support (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase again 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/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
index c7ef9613aa514717ba5b5060a0b896f8dfd07313..0297f0a243be315c2a94848bdf4d9e90e5130b36 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_server.cc
@@ -2871,7 +2871,8 @@ static void PPB_WebSocket_ReceiveMessageDispatcher(
done,
inputs[0]->u.ival,
inputs[1]->u.ival,
- &(outputs[0]->u.ival)
+ &(outputs[0]->u.ival),
+ &(outputs[1]->u.count), outputs[1]->arrays.carr
);
}
@@ -3297,7 +3298,7 @@ NaClSrpcHandlerDesc PpbRpcs::srpc_methods[] = {
{ "PPB_WebSocket_IsWebSocket:i:i", PPB_WebSocket_IsWebSocketDispatcher },
{ "PPB_WebSocket_Connect:iCCii:i", PPB_WebSocket_ConnectDispatcher },
{ "PPB_WebSocket_Close:iiCi:i", PPB_WebSocket_CloseDispatcher },
- { "PPB_WebSocket_ReceiveMessage:ii:i", PPB_WebSocket_ReceiveMessageDispatcher },
+ { "PPB_WebSocket_ReceiveMessage:ii:iC", PPB_WebSocket_ReceiveMessageDispatcher },
{ "PPB_WebSocket_SendMessage:iC:i", PPB_WebSocket_SendMessageDispatcher },
{ "PPB_WebSocket_GetBufferedAmount:i:l", PPB_WebSocket_GetBufferedAmountDispatcher },
{ "PPB_WebSocket_GetCloseCode:i:i", PPB_WebSocket_GetCloseCodeDispatcher },

Powered by Google App Engine
This is Rietveld 408576698