Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 19005006: Switched proxy for TCPServerSocketPrivate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed content_unittests. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 cd5caac60b50653f6f60dec7a9e5d548995bbbca..2549849f0f33826e20eda0d1d1981d2bebe0a0b8 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -98,7 +98,6 @@
#include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
#include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
-#include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"
#include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
#include "webkit/plugins/ppapi/resource_helper.h"
#include "webkit/plugins/webplugininfo.h"
@@ -1224,30 +1223,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::AddNetworkListObserver(
webkit_glue::NetworkListObserver* observer) {
#if defined(ENABLE_WEBRTC)
@@ -1495,10 +1470,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;
@@ -1564,46 +1535,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();
}

Powered by Google App Engine
This is Rietveld 408576698