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

Unified Diff: content/browser/renderer_host/pepper_tcp_server_socket.cc

Issue 9669038: Added out-of-process support for server sockets. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: PPB_TCPServerSocket_Private_Proxy constructor from Dispatcher* marked as explicit. Created 8 years, 9 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/browser/renderer_host/pepper_tcp_server_socket.cc
diff --git a/content/browser/renderer_host/pepper_tcp_server_socket.cc b/content/browser/renderer_host/pepper_tcp_server_socket.cc
index b108d0f61da79d36e26689680e45274212857a11..67dd4fe8c86a7587f4e78e33cc7b4d601472290b 100644
--- a/content/browser/renderer_host/pepper_tcp_server_socket.cc
+++ b/content/browser/renderer_host/pepper_tcp_server_socket.cc
@@ -57,7 +57,7 @@ void PepperTCPServerSocket::Listen(const PP_NetAddress_Private& addr,
OnListenCompleted(result);
}
-void PepperTCPServerSocket::Accept() {
+void PepperTCPServerSocket::Accept(int32 tcp_client_sockets_routing_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (state_ != LISTENING) {
@@ -70,9 +70,10 @@ void PepperTCPServerSocket::Accept() {
int result = socket_->Accept(
&socket_buffer_,
base::Bind(&PepperTCPServerSocket::OnAcceptCompleted,
- base::Unretained(this)));
+ base::Unretained(this),
+ tcp_client_sockets_routing_id));
if (result != net::ERR_IO_PENDING)
- OnAcceptCompleted(result);
+ OnAcceptCompleted(tcp_client_sockets_routing_id, result);
}
void PepperTCPServerSocket::CancelListenRequest() {
@@ -115,7 +116,9 @@ void PepperTCPServerSocket::OnListenCompleted(int result) {
}
}
-void PepperTCPServerSocket::OnAcceptCompleted(int result) {
+void PepperTCPServerSocket::OnAcceptCompleted(
+ int32 tcp_client_sockets_routing_id,
+ int result) {
DCHECK(state_ == ACCEPT_IN_PROGRESS && socket_buffer_.get());
if (result != net::OK) {
@@ -139,7 +142,7 @@ void PepperTCPServerSocket::OnAcceptCompleted(int result) {
SendAcceptACKError();
} else {
uint32 accepted_socket_id =
- manager_->AddAcceptedTCPSocket(routing_id_,
+ manager_->AddAcceptedTCPSocket(tcp_client_sockets_routing_id,
plugin_dispatcher_id_,
socket.release());
if (accepted_socket_id != 0) {

Powered by Google App Engine
This is Rietveld 408576698