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 45 matching lines @@
 #include "media/video/capture/video_capture_proxy.h"
 #include "ppapi/c/dev/pp_video_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
 #include "ppapi/shared_impl/platform_file.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
+#include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppb_tcp_server_socket_private_api.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/size.h"
@@ skipping 976 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);
   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));
+void PepperPluginDelegateImpl::TCPServerSocketAccept(uint32 server_socket_id) {
+  DCHECK(tcp_server_sockets_.Lookup(server_socket_id));
   render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Accept(
-      real_socket_id));
+      render_view_->routing_id(), server_socket_id));
 }
 
 void PepperPluginDelegateImpl::TCPServerSocketStopListening(
-    uint32 real_socket_id,
-    uint32 temp_socket_id) {
-  if (real_socket_id == 0) {
-    if (uninitialized_tcp_server_sockets_.Lookup(temp_socket_id)) {
-      // Pending Listen request.
-      uninitialized_tcp_server_sockets_.Remove(temp_socket_id);
-    }
-  } else {
-    render_view_->Send(
-        new PpapiHostMsg_PPBTCPServerSocket_Destroy(real_socket_id));
-    tcp_server_sockets_.Remove(real_socket_id);
+    PP_Resource socket_resource,
+    uint32 socket_id) {
+  if (socket_id != 0) {
+    render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Destroy(socket_id));
+    tcp_server_sockets_.Remove(socket_id);
   }
 }
 
 bool PepperPluginDelegateImpl::AddNetworkListObserver(
     webkit_glue::NetworkListObserver* observer) {
 #if defined(ENABLE_P2P_APIS)
   content::P2PSocketDispatcher* socket_dispatcher =
       render_view_->p2p_socket_dispatcher();
   if (!socket_dispatcher) {
     return false;
@@ skipping 356 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,
-    uint32 real_socket_id,
-    uint32 temp_socket_id,
+    PP_Resource socket_resource,
+    uint32 socket_id,
     int32_t status) {
-  webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket =
-      uninitialized_tcp_server_sockets_.Lookup(temp_socket_id);
-  if (socket == NULL) {
+  ppapi::thunk::EnterResource<ppapi::thunk::PPB_TCPServerSocket_Private_API>
+      enter(socket_resource, true);
+  if (enter.succeeded()) {
+    ppapi::PPB_TCPServerSocket_Shared* socket =
+        static_cast<ppapi::PPB_TCPServerSocket_Shared*>(enter.object());
+    if (status == PP_OK)
+      tcp_server_sockets_.AddWithID(socket, socket_id);
+    socket->OnListenCompleted(socket_id, status);
+  } else if (socket_id != 0 && status == PP_OK) {
     // 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);
-
-    if (status == PP_OK)
-      tcp_server_sockets_.AddWithID(socket, real_socket_id);
-    socket->OnListenCompleted(real_socket_id, status);
+    render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Destroy(socket_id));
   }
 }
 
 void PepperPluginDelegateImpl::OnTCPServerSocketAcceptACK(
     uint32 plugin_dispatcher_id,
-    uint32 real_server_socket_id,
+    uint32 server_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);
+  ppapi::PPB_TCPServerSocket_Shared* socket =
+      tcp_server_sockets_.Lookup(server_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);
+  } else {
+    render_view_->Send(

[yzshen1, 2012/03/14 17:05:04]

nit: only send Disconnect when accepted_socket_id != 0.

[ygorshenin1, 2012/03/15 07:08:04]

Done.

+        new PpapiHostMsg_PPBTCPSocket_Disconnect(accepted_socket_id));
   }
 }
 
 int PepperPluginDelegateImpl::GetRoutingID() const {
   return render_view_->routing_id();
 }
 
 int PepperPluginDelegateImpl::OpenDevice(PP_DeviceType_Dev type,
                                          const std::string& device_id,
                                          const OpenDeviceCallback& callback) {
@@ skipping 74 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;
 }