Added out-of-process support for server sockets.

content/renderer/pepper/pepper_plugin_delegate_impl.cc

Index: content/renderer/pepper/pepper_plugin_delegate_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index c2041e7c978e9dfb900d0742b64d8089174efe20..52ef886492d494308ad0c11e36b9b1bee5fa4689 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -1060,28 +1060,28 @@ void PepperPluginDelegateImpl::UDPSocketClose(uint32 socket_id) {
 
 void PepperPluginDelegateImpl::TCPServerSocketListen(
     webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket,
-    uint32 temp_socket_id,
+    PP_Resource socket_resource,
     const PP_NetAddress_Private& addr,
     int32_t backlog) {
-  uninitialized_tcp_server_sockets_.AddWithID(socket, temp_socket_id);
+  uninitialized_tcp_server_sockets_.AddWithID(socket, socket_resource);
   render_view_->Send(
       new PpapiHostMsg_PPBTCPServerSocket_Listen(
-          render_view_->routing_id(), 0, temp_socket_id, addr, backlog));
+          render_view_->routing_id(), 0, socket_resource, addr, backlog));
 }
 
 void PepperPluginDelegateImpl::TCPServerSocketAccept(uint32 real_socket_id) {
   DCHECK(tcp_server_sockets_.Lookup(real_socket_id));
   render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Accept(
-      real_socket_id));
+      render_view_->routing_id(), real_socket_id));
 }
 
 void PepperPluginDelegateImpl::TCPServerSocketStopListening(
-    uint32 real_socket_id,
-    uint32 temp_socket_id) {
+    PP_Resource socket_resource,
+    uint32 real_socket_id) {
   if (real_socket_id == 0) {
-    if (uninitialized_tcp_server_sockets_.Lookup(temp_socket_id)) {
+    if (uninitialized_tcp_server_sockets_.Lookup(socket_resource)) {
       // Pending Listen request.
-      uninitialized_tcp_server_sockets_.Remove(temp_socket_id);
+      uninitialized_tcp_server_sockets_.Remove(socket_resource);
     }
   } else {
     render_view_->Send(
@@ -1463,17 +1463,17 @@ void PepperPluginDelegateImpl::OnUDPSocketSendToACK(uint32 plugin_dispatcher_id,
 
 void PepperPluginDelegateImpl::OnTCPServerSocketListenACK(
     uint32 plugin_dispatcher_id,
+    PP_Resource socket_resource,
     uint32 real_socket_id,
-    uint32 temp_socket_id,
     int32_t status) {
   webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket =
-      uninitialized_tcp_server_sockets_.Lookup(temp_socket_id);
+      uninitialized_tcp_server_sockets_.Lookup(socket_resource);

[yzshen1, 2012/03/13 17:46:32]

Can we also use EnterResource and remove uninitialized_tcp_server_sockets_?

[ygorshenin1, 2012/03/14 11:36:18]

Sure, thanks!

On 2012/03/13 17:46:32, yzshen1 wrote:

   if (socket == NULL) {
     // StopListening was called before completion of Listen.
     render_view_->Send(
         new PpapiHostMsg_PPBTCPServerSocket_Destroy(real_socket_id));
   } else {
-    uninitialized_tcp_server_sockets_.Remove(temp_socket_id);
+    uninitialized_tcp_server_sockets_.Remove(socket_resource);
 
     if (status == PP_OK)
       tcp_server_sockets_.AddWithID(socket, real_socket_id);
@@ -1483,14 +1483,14 @@ void PepperPluginDelegateImpl::OnTCPServerSocketListenACK(
 
 void PepperPluginDelegateImpl::OnTCPServerSocketAcceptACK(
     uint32 plugin_dispatcher_id,
-    uint32 real_server_socket_id,
+    uint32 real_socket_id,
     uint32 accepted_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(real_server_socket_id);
+      tcp_server_sockets_.Lookup(real_socket_id);
   if (socket) {
-    bool succeeded = accepted_socket_id != 0;
+    bool succeeded = (accepted_socket_id != 0);
     socket->OnAcceptCompleted(succeeded,
                               accepted_socket_id,
                               local_addr,