| Index: ppapi/thunk/ppb_websocket_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc
|
| index e83293ca4361da94aef94d4fec2df8ebb1ac4e26..81ec534ad3952de9d21c093709d1de59eaea4476 100644
|
| --- a/ppapi/thunk/ppb_websocket_thunk.cc
|
| +++ b/ppapi/thunk/ppb_websocket_thunk.cc
|
| @@ -37,7 +37,7 @@ int32_t Connect(PP_Resource resource,
|
| if (enter.failed())
|
| return enter.retval();
|
| return enter.SetResult(enter.object()->Connect(
|
| - url, protocols, protocol_count, callback));
|
| + url, protocols, protocol_count, enter.callback()));
|
| }
|
|
|
| int32_t Close(PP_Resource resource,
|
| @@ -47,7 +47,7 @@ int32_t Close(PP_Resource resource,
|
| EnterWebSocket enter(resource, callback, false);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->Close(code, reason, callback));
|
| + return enter.SetResult(enter.object()->Close(code, reason, enter.callback()));
|
| }
|
|
|
| int32_t ReceiveMessage(PP_Resource resource,
|
| @@ -56,7 +56,8 @@ int32_t ReceiveMessage(PP_Resource resource,
|
| EnterWebSocket enter(resource, callback, false);
|
| if (enter.failed())
|
| return enter.retval();
|
| - return enter.SetResult(enter.object()->ReceiveMessage(message, callback));
|
| + return enter.SetResult(enter.object()->ReceiveMessage(message,
|
| + enter.callback()));
|
| }
|
|
|
| int32_t SendMessage(PP_Resource resource, PP_Var message) {
|
|
|