Index: content/renderer/pepper/pepper_plugin_delegate_impl.h |
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h |
index f5519b4bfe383f7b8013a4d73c41e6562e338d07..f35d0b343a8e5d45d3b55fa6255906583faf13a9 100644 |
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.h |
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h |
@@ -20,6 +20,7 @@ |
#include "content/public/renderer/render_view_observer.h" |
#include "content/renderer/mouse_lock_dispatcher.h" |
#include "content/renderer/pepper/pepper_parent_context_provider.h" |
+#include "ppapi/shared_impl/private/ppb_tcp_server_socket_shared.h" |
#include "ppapi/shared_impl/private/tcp_socket_private_impl.h" |
#include "ppapi/shared_impl/private/udp_socket_private_impl.h" |
#include "ui/base/ime/text_input_type.h" |
@@ -293,13 +294,13 @@ class PepperPluginDelegateImpl |
const PP_NetAddress_Private& addr) OVERRIDE; |
virtual void UDPSocketClose(uint32 socket_id) OVERRIDE; |
virtual void TCPServerSocketListen( |
- webkit::ppapi::PPB_TCPServerSocket_Private_Impl* socket, |
- uint32 temp_socket_id, |
+ PP_Resource socket_resource, |
const PP_NetAddress_Private& addr, |
int32_t backlog) OVERRIDE; |
- virtual void TCPServerSocketAccept(uint32 real_socket_id) OVERRIDE; |
- virtual void TCPServerSocketStopListening(uint32 real_socket_id, |
- uint32 temp_socket_id) OVERRIDE; |
+ virtual void TCPServerSocketAccept(uint32 server_socket_id) OVERRIDE; |
+ virtual void TCPServerSocketStopListening( |
+ PP_Resource socket_resource, |
+ uint32 socket_id) OVERRIDE; |
virtual bool AddNetworkListObserver( |
webkit_glue::NetworkListObserver* observer) OVERRIDE; |
@@ -385,11 +386,11 @@ class PepperPluginDelegateImpl |
const std::string& data, |
const PP_NetAddress_Private& addr); |
void OnTCPServerSocketListenACK(uint32 plugin_dispatcher_id, |
- uint32 real_socket_id, |
- uint32 temp_socket_id, |
+ PP_Resource socket_resource, |
+ uint32 socket_id, |
int32_t status); |
void OnTCPServerSocketAcceptACK(uint32 plugin_dispatcher_id, |
- uint32 real_server_socket_id, |
+ uint32 socket_id, |
uint32 accepted_socket_id, |
const PP_NetAddress_Private& local_addr, |
const PP_NetAddress_Private& remote_addr); |
@@ -445,10 +446,7 @@ class PepperPluginDelegateImpl |
IDMap<webkit::ppapi::PPB_UDPSocket_Private_Impl> udp_sockets_; |
- IDMap<webkit::ppapi::PPB_TCPServerSocket_Private_Impl> tcp_server_sockets_; |
- |
- IDMap<webkit::ppapi::PPB_TCPServerSocket_Private_Impl> |
- uninitialized_tcp_server_sockets_; |
+ IDMap<ppapi::PPB_TCPServerSocket_Shared> tcp_server_sockets_; |
IDMap<scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl>, |
IDMapOwnPointer> pending_context_menus_; |