Added out-of-process support for server sockets.

content/renderer/pepper/pepper_plugin_delegate_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <map>
 #include <queue>
 
@@ skipping 1042 matching lines @@
 void PepperPluginDelegateImpl::UDPSocketClose(uint32 socket_id) {
   // There are no DCHECK(udp_sockets_.Lookup(socket_id)) because it
   // can be called before UDPSocketBind is called.
   render_view_->Send(new PpapiHostMsg_PPBUDPSocket_Close(socket_id));
   if (udp_sockets_.Lookup(socket_id))
     udp_sockets_.Remove(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(
         new PpapiHostMsg_PPBTCPServerSocket_Destroy(real_socket_id));
     tcp_server_sockets_.Remove(real_socket_id);
   }
 }
 
 bool PepperPluginDelegateImpl::AddNetworkListObserver(
     webkit_glue::NetworkListObserver* observer) {
@@ skipping 361 matching lines @@
                                                     bool succeeded,
                                                     int32_t bytes_written) {
   webkit::ppapi::PPB_UDPSocket_Private_Impl* socket =
       udp_sockets_.Lookup(socket_id);
   if (socket)
     socket->OnSendToCompleted(succeeded, bytes_written);
 }
 
 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);
     socket->OnListenCompleted(real_socket_id, status);
   }
 }
 
 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,
                               remote_addr);
   }

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

Please consider sending back a message to destroy the accepted tcp socket (if
created) when the server socket cannot be found.

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

Done.

 }
 
 int PepperPluginDelegateImpl::GetRoutingID() const {
   return render_view_->routing_id();
 }
 
 int PepperPluginDelegateImpl::OpenDevice(PP_DeviceType_Dev type,
                                          const std::string& device_id,
                                          const OpenDeviceCallback& callback) {
   int request_id =
@@ skipping 73 matching lines @@
     render_view_->mouse_lock_dispatcher()->OnLockTargetDestroyed(target);
     delete target;
     mouse_lock_instances_.erase(it);
   }
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }