PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_tcp_server_socket_private_proxy.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 "ppapi/proxy/ppb_tcp_server_socket_private_proxy.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_proxy_delegate.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_tcp_socket_private_proxy.h"
 #include "ppapi/shared_impl/private/ppb_tcp_server_socket_shared.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace proxy {
 
-typedef thunk::EnterResource<thunk::PPB_TCPServerSocket_Private_API>
-    EnterTCPServerSocket;
-
 namespace {
 
 class TCPServerSocket : public PPB_TCPServerSocket_Shared {
  public:
   TCPServerSocket(const HostResource& resource, uint32 plugin_dispatcher_id);
   virtual ~TCPServerSocket();
 
   virtual void OnAcceptCompleted(
       bool succeeded,
       uint32 tcp_socket_id,
@@ skipping 119 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PPB_TCPServerSocket_Private_Proxy::OnMsgListenACK(
     uint32 plugin_dispatcher_id,
     PP_Resource socket_resource,
     uint32 socket_id,
     int32_t status) {
-  EnterTCPServerSocket enter(socket_resource, true);

[dmichael (off chromium), 2012/04/19 20:02:00]

This is a slightly unrelated change, but it was double-locking before if
enable-pepper-threading=1, which puts a damper on my local testing.

+ thunk::EnterResourceNoLock<thunk::PPB_TCPServerSocket_Private_API>
+     enter(socket_resource, true);
   if (enter.succeeded()) {
     PPB_TCPServerSocket_Shared* server_socket =
         static_cast<PPB_TCPServerSocket_Shared*>(enter.object());
     if (status == PP_OK)
       id_to_server_socket_[socket_id] = server_socket;
     server_socket->OnListenCompleted(socket_id, status);
   } else if (socket_id != 0 && status == PP_OK) {
     IPC::Message* msg =
         new PpapiHostMsg_PPBTCPServerSocket_Destroy(socket_id);
     PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(msg);
@@ skipping 15 matching lines @@
                                   local_addr,
                                   remote_addr);
   } else if (accepted_socket_id != 0) {
     PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser(
         new PpapiHostMsg_PPBTCPSocket_Disconnect(accepted_socket_id));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi