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

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

Issue 24364005: Update webrtc to r4819. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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
« no previous file with comments | « DEPS ('k') | jingle/glue/channel_socket_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/p2p/ipc_socket_factory.cc
===================================================================
--- content/renderer/p2p/ipc_socket_factory.cc (revision 224785)
+++ content/renderer/p2p/ipc_socket_factory.cc (working copy)
@@ -48,9 +48,11 @@
// talk_base::AsyncPacketSocket interface.
virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
- virtual int Send(const void *pv, size_t cb) OVERRIDE;
+ virtual int Send(const void *pv, size_t cb,
+ talk_base::DiffServCodePoint dscp) OVERRIDE;
virtual int SendTo(const void *pv, size_t cb,
- const talk_base::SocketAddress& addr) OVERRIDE;
+ const talk_base::SocketAddress& addr,
+ talk_base::DiffServCodePoint dscp) OVERRIDE;
virtual int Close() OVERRIDE;
virtual State GetState() const OVERRIDE;
virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
@@ -202,13 +204,15 @@
return remote_address_;
}
-int IpcPacketSocket::Send(const void *data, size_t data_size) {
+int IpcPacketSocket::Send(const void *data, size_t data_size,
+ talk_base::DiffServCodePoint dscp) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
- return SendTo(data, data_size, remote_address_);
+ return SendTo(data, data_size, remote_address_, dscp);
}
int IpcPacketSocket::SendTo(const void *data, size_t data_size,
- const talk_base::SocketAddress& address) {
+ const talk_base::SocketAddress& address,
+ talk_base::DiffServCodePoint dscp) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
switch (state_) {
« no previous file with comments | « DEPS ('k') | jingle/glue/channel_socket_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698