Exposed Listen and Accept methods to plugin.

content/renderer/pepper_plugin_delegate_impl.cc

Index: content/renderer/pepper_plugin_delegate_impl.cc
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index f2152b14218cf2b8d229b5ba64dc27a2dc242738..e480d1bfae81536194baa8a170818d2db9d417c4 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -78,6 +78,7 @@
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
+#include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_udp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
@@ -1709,7 +1710,7 @@ void PepperPluginDelegateImpl::TCPSocketConnect(
     uint32 socket_id,
     const std::string& host,
     uint16_t port) {
-  tcp_sockets_.AddWithID(socket, socket_id);
+  TCPSocketRegister(socket, socket_id);
   render_view_->Send(
       new PpapiHostMsg_PPBTCPSocket_Connect(socket_id, host, port));
 }
@@ -1753,6 +1754,12 @@ void PepperPluginDelegateImpl::TCPSocketDisconnect(uint32 socket_id) {
   tcp_sockets_.Remove(socket_id);
 }
 
+void PepperPluginDelegateImpl::TCPSocketRegister(
+    webkit::ppapi::PPB_TCPSocket_Private_Impl* socket,
+    uint32 socket_id) {
+  tcp_sockets_.AddWithID(socket, socket_id);
+}
+
 uint32 PepperPluginDelegateImpl::UDPSocketCreate() {
   if (!CanUseSocketAPIs())
     return 0;
@@ -1794,6 +1801,39 @@ void PepperPluginDelegateImpl::UDPSocketClose(uint32 socket_id) {
   udp_sockets_.Remove(socket_id);
 }
 
+uint32 PepperPluginDelegateImpl::TCPServerSocketCreate() {
+  if (!CanUseSocketAPIs())
+    return 0;
+
+  uint32 socket_id = 0;
+  render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Create(

[brettw, 2012/02/07 00:15:22]

Supporting these in the renderer is very problematic. Justin will follow up, we
also need to figure out what to do about the existing socket sending stuff.

[Dmitry Polukhin, 2012/02/07 06:45:50]

I think we need to transform "create" methods to async methods with callback. It
will also simplify check what pages/renders can use socket APIs. Now this check
happens in render but it needs to be moved to browser process. Inside browser
process it is easy to do on UI thread but create messages are processed to IO
thread. With async methods it will be easy to send message from IO to UI thread.

[ygorshenin1, 2012/02/07 13:42:59]

Fixed: PPB_TCPServerSocke_Private::Create method is asynchronous now.

On 2012/02/07 06:45:50, Dmitry Polukhin wrote:

+      render_view_->routing_id(), 0, &socket_id));
+  return socket_id;
+}
+
+void PepperPluginDelegateImpl::TCPServerSocketListen(
+    webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket,
+    uint32 socket_id,
+    const PP_NetAddress_Private& addr,
+    int32_t backlog) {
+  tcp_server_sockets_.AddWithID(socket, socket_id);
+  render_view_->Send(
+      new PpapiHostMsg_PPBTCPServerSocket_Listen(socket_id, addr, backlog));
+}
+
+void PepperPluginDelegateImpl::TCPServerSocketAccept(uint32 socket_id) {
+  DCHECK(tcp_server_sockets_.Lookup(socket_id));
+  render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Accept(socket_id));
+}
+
+void PepperPluginDelegateImpl::TCPServerSocketStopListening(uint32 socket_id) {
+  // There are no DCHECK(tcp_server_sockets_.Lookup(socket_id))
+  // because it can be called before TCPServerSocketListen is called.
+  render_view_->Send(
+      new PpapiHostMsg_PPBTCPServerSocket_StopListening(socket_id));
+  tcp_server_sockets_.Remove(socket_id);
+}
+
 int32_t PepperPluginDelegateImpl::ShowContextMenu(
     webkit::ppapi::PluginInstance* instance,
     webkit::ppapi::PPB_Flash_Menu_Impl* menu,
@@ -2057,6 +2097,10 @@ bool PepperPluginDelegateImpl::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBUDPSocket_RecvFromACK,
                         OnUDPSocketRecvFromACK)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBUDPSocket_SendToACK, OnUDPSocketSendToACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPServerSocket_ListenACK,
+                        OnTCPServerSocketListenACK)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPServerSocket_AcceptACK,
+                        OnTCPServerSocketAcceptACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -2078,6 +2122,8 @@ void PepperPluginDelegateImpl::OnTCPSocketConnectACK(
       tcp_sockets_.Lookup(socket_id);
   if (socket)
     socket->OnConnectCompleted(succeeded, local_addr, remote_addr);
+  if (!succeeded)
+    tcp_sockets_.Remove(socket_id);
 }
 
 void PepperPluginDelegateImpl::OnTCPSocketSSLHandshakeACK(
@@ -2117,6 +2163,8 @@ void PepperPluginDelegateImpl::OnUDPSocketBindACK(uint32 plugin_dispatcher_id,
       udp_sockets_.Lookup(socket_id);
   if (socket)
     socket->OnBindCompleted(succeeded);
+  if (!succeeded)
+    udp_sockets_.Remove(socket_id);
 }
 
 void PepperPluginDelegateImpl::OnUDPSocketRecvFromACK(
@@ -2141,6 +2189,35 @@ void PepperPluginDelegateImpl::OnUDPSocketSendToACK(uint32 plugin_dispatcher_id,
     socket->OnSendToCompleted(succeeded, bytes_written);
 }
 
+void PepperPluginDelegateImpl::OnTCPServerSocketListenACK(
+    uint32 plugin_dispatcher_id,
+    uint32 socket_id,
+    bool succeeded) {
+  webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket =
+      tcp_server_sockets_.Lookup(socket_id);
+  if (socket)
+    socket->OnListenCompleted(succeeded);
+  if (!succeeded)
+    tcp_server_sockets_.Remove(socket_id);
+}
+
+void PepperPluginDelegateImpl::OnTCPServerSocketAcceptACK(
+    uint32 plugin_dispatcher_id,
+    uint32 tcp_server_socket_id,
+    uint32 tcp_socket_id,
+    const PP_NetAddress_Private& local_addr,
+    const PP_NetAddress_Private& remote_addr) {
+  webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket =
+      tcp_server_sockets_.Lookup(tcp_server_socket_id);
+  if (socket) {
+    bool succeeded = tcp_socket_id != 0;
+    socket->OnAcceptCompleted(succeeded,
+                              tcp_socket_id,
+                              local_addr,
+                              remote_addr);
+  }
+}
+
 int PepperPluginDelegateImpl::GetRoutingId() const {
   return render_view_->routing_id();
 }