content/renderer/p2p/socket_client.cc - Issue 10917167: Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/p2p/socket_client.cc

Issue 10917167: Refactor the P2PSocketDispatcher to be created on the RenderThread instead of the RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Change P2PSocketDispatcher to take the io message loop as input to fix existing unit tests Created 8 years, 3 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

« content/browser/renderer_host/p2p/socket_dispatcher_host.cc ('K') | « content/renderer/p2p/host_address_request.cc ('k') | content/renderer/p2p/socket_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/p2p/socket_client.cc

diff --git a/content/renderer/p2p/socket_client.cc b/content/renderer/p2p/socket_client.cc

index 899366f39284da838b58138389ff3f5a90ba1946..76357cd2b45fdc0bc08f1d654e74118fbd38eb10 100644

--- a/content/renderer/p2p/socket_client.cc

+++ b/content/renderer/p2p/socket_client.cc

@@ -40,7 +40,7 @@ void P2PSocketClient::Init(

delegate_ = delegate;

socket_id_ = dispatcher_->RegisterClient(this);

dispatcher_->SendP2PMessage(new P2PHostMsg_CreateSocket(

- 0, type, socket_id_, local_address, remote_address));

+ type, socket_id_, local_address, remote_address));

}

void P2PSocketClient::Send(const net::IPEndPoint& address,

@@ -54,8 +54,7 @@ void P2PSocketClient::Send(const net::IPEndPoint& address,

// Can send data only when the socket is open.

DCHECK(state_ == STATE_OPEN || state_ == STATE_ERROR);

if (state_ == STATE_OPEN) {

- dispatcher_->SendP2PMessage(

- new P2PHostMsg_Send(0, socket_id_, address, data));

+ dispatcher_->SendP2PMessage(new P2PHostMsg_Send(socket_id_, address, data));

}

@@ -72,7 +71,7 @@ void P2PSocketClient::DoClose() {

if (dispatcher_) {

if (state_ == STATE_OPEN || state_ == STATE_OPENING ||

state_ == STATE_ERROR) {

- dispatcher_->SendP2PMessage(new P2PHostMsg_DestroySocket(0, socket_id_));

+ dispatcher_->SendP2PMessage(new P2PHostMsg_DestroySocket(socket_id_));

}

dispatcher_->UnregisterClient(socket_id_);

}

@@ -110,7 +109,7 @@ void P2PSocketClient::OnIncomingTcpConnection(const net::IPEndPoint& address) {

new_client->delegate_message_loop_ = delegate_message_loop_;

dispatcher_->SendP2PMessage(new P2PHostMsg_AcceptIncomingTcpConnection(

- 0, socket_id_, address, new_client->socket_id_));

+ socket_id_, address, new_client->socket_id_));

delegate_message_loop_->PostTask(

FROM_HERE, base::Bind(&P2PSocketClient::DeliverOnIncomingTcpConnection,