Chromium Code Reviews| Index: ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc |
| =================================================================== |
| --- ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc (revision 214423) |
| +++ ppapi/proxy/ppb_tcp_server_socket_private_proxy.cc (working copy) |
| @@ -28,11 +28,11 @@ |
| TCPServerSocket(const HostResource& resource, uint32 plugin_dispatcher_id); |
| virtual ~TCPServerSocket(); |
| - virtual void OnAcceptCompleted( |
| + void OnAcceptCompleted( |
| bool succeeded, |
| uint32 tcp_socket_id, |
| const PP_NetAddress_Private& local_addr, |
| - const PP_NetAddress_Private& remote_addr) OVERRIDE; |
| + const PP_NetAddress_Private& remote_addr); |
| virtual void SendListen(const PP_NetAddress_Private& addr, |
| int32_t backlog) OVERRIDE; |
| @@ -176,7 +176,7 @@ |
| } |
| void PPB_TCPServerSocket_Private_Proxy::OnMsgAcceptACK( |
| - uint32 plugin_dispatcher_id, |
| + int32 socket_routing_id, |
| uint32 server_socket_id, |
| uint32 accepted_socket_id, |
| const PP_NetAddress_Private& local_addr, |
| @@ -185,10 +185,11 @@ |
| id_to_server_socket_.find(server_socket_id); |
| if (it != id_to_server_socket_.end()) { |
| bool succeeded = (accepted_socket_id != 0); |
| - it->second->OnAcceptCompleted(succeeded, |
| - accepted_socket_id, |
| - local_addr, |
| - remote_addr); |
| + TCPServerSocket* socket = static_cast<TCPServerSocket*>(it->second); |
|
dmichael (off chromium)
2013/08/01 22:43:01
suggestion: You could DCHECK(PpapiGlobals::Get()->
|
| + socket->OnAcceptCompleted(succeeded, |
| + accepted_socket_id, |
| + local_addr, |
| + remote_addr); |
| } else if (accepted_socket_id != 0) { |
| PluginGlobals::Get()->GetBrowserSender()->Send( |
| new PpapiHostMsg_PPBTCPSocket_Disconnect(accepted_socket_id)); |