| 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 681507308d3242365aa9dac08d368be1831abaea..f229ddfb20214ecb77b0dd4c450d2dc114c8d179 100644
|
| --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
|
| @@ -52,7 +52,6 @@
|
| #include "content/renderer/pepper/pepper_url_loader_host.h"
|
| #include "content/renderer/pepper/pepper_webplugin_impl.h"
|
| #include "content/renderer/pepper/plugin_module.h"
|
| -#include "content/renderer/pepper/ppb_tcp_server_socket_private_impl.h"
|
| #include "content/renderer/pepper/ppb_tcp_socket_private_impl.h"
|
| #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
|
| #include "content/renderer/pepper/resource_helper.h"
|
| @@ -963,30 +962,6 @@ void PepperPluginDelegateImpl::RegisterTCPSocket(
|
| tcp_sockets_.AddWithID(socket, socket_id);
|
| }
|
|
|
| -void PepperPluginDelegateImpl::TCPServerSocketListen(
|
| - PP_Resource socket_resource,
|
| - const PP_NetAddress_Private& addr,
|
| - int32_t backlog) {
|
| - render_view_->Send(
|
| - new PpapiHostMsg_PPBTCPServerSocket_Listen(
|
| - render_view_->routing_id(), 0, socket_resource, addr, backlog));
|
| -}
|
| -
|
| -void PepperPluginDelegateImpl::TCPServerSocketAccept(uint32 server_socket_id) {
|
| - DCHECK(tcp_server_sockets_.Lookup(server_socket_id));
|
| - render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Accept(
|
| - render_view_->routing_id(), server_socket_id));
|
| -}
|
| -
|
| -void PepperPluginDelegateImpl::TCPServerSocketStopListening(
|
| - 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::X509CertificateParseDER(
|
| const std::vector<char>& der,
|
| ppapi::PPB_X509Certificate_Fields* fields) {
|
| @@ -1163,10 +1138,6 @@ bool PepperPluginDelegateImpl::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_WriteACK, OnTCPSocketWriteACK)
|
| IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_SetOptionACK,
|
| OnTCPSocketSetOptionACK)
|
| - IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPServerSocket_ListenACK,
|
| - OnTCPServerSocketListenACK)
|
| - IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPServerSocket_AcceptACK,
|
| - OnTCPServerSocketAcceptACK)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -1227,46 +1198,6 @@ void PepperPluginDelegateImpl::OnTCPSocketSetOptionACK(
|
| socket->OnSetOptionCompleted(result);
|
| }
|
|
|
| -void PepperPluginDelegateImpl::OnTCPServerSocketListenACK(
|
| - uint32 plugin_dispatcher_id,
|
| - PP_Resource socket_resource,
|
| - uint32 socket_id,
|
| - const PP_NetAddress_Private& local_addr,
|
| - int32_t status) {
|
| - 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, local_addr, status);
|
| - } else if (socket_id != 0 && status == PP_OK) {
|
| - // StopListening was called before completion of Listen.
|
| - render_view_->Send(new PpapiHostMsg_PPBTCPServerSocket_Destroy(socket_id));
|
| - }
|
| -}
|
| -
|
| -void PepperPluginDelegateImpl::OnTCPServerSocketAcceptACK(
|
| - uint32 plugin_dispatcher_id,
|
| - uint32 server_socket_id,
|
| - uint32 accepted_socket_id,
|
| - const PP_NetAddress_Private& local_addr,
|
| - const PP_NetAddress_Private& remote_addr) {
|
| - ppapi::PPB_TCPServerSocket_Shared* socket =
|
| - tcp_server_sockets_.Lookup(server_socket_id);
|
| - if (socket) {
|
| - bool succeeded = (accepted_socket_id != 0);
|
| - socket->OnAcceptCompleted(succeeded,
|
| - accepted_socket_id,
|
| - local_addr,
|
| - remote_addr);
|
| - } else if (accepted_socket_id != 0) {
|
| - render_view_->Send(
|
| - new PpapiHostMsg_PPBTCPSocket_Disconnect(accepted_socket_id));
|
| - }
|
| -}
|
| -
|
| int PepperPluginDelegateImpl::GetRoutingID() const {
|
| return render_view_->routing_id();
|
| }
|
|
|