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

Side by Side Diff: content/renderer/p2p/ipc_socket_factory.cc

Issue 103143004: Update webrtc/libjingle 5268:5288. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/p2p/ipc_socket_factory.h" 5 #include "content/renderer/p2p/ipc_socket_factory.h"
6 6
7 #include <deque> 7 #include <deque>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 DCHECK_EQ(base::MessageLoop::current(), message_loop_); 385 DCHECK_EQ(base::MessageLoop::current(), message_loop_);
386 386
387 talk_base::SocketAddress address_lj; 387 talk_base::SocketAddress address_lj;
388 if (!jingle_glue::IPEndPointToSocketAddress(address, &address_lj)) { 388 if (!jingle_glue::IPEndPointToSocketAddress(address, &address_lj)) {
389 // We should always be able to convert address here because we 389 // We should always be able to convert address here because we
390 // don't expect IPv6 address on IPv4 connections. 390 // don't expect IPv6 address on IPv4 connections.
391 NOTREACHED(); 391 NOTREACHED();
392 return; 392 return;
393 } 393 }
394 394
395 SignalReadPacket(this, &data[0], data.size(), address_lj); 395 SignalReadPacket(this, &data[0], data.size(), address_lj,
396 talk_base::CreatePacketTime(0));
Mallinath (Gone from Chromium) 2013/12/16 14:04:56 sync to the latest and uncomment |packet_time| whi
Ronghua Wu (Left Chromium) 2013/12/16 16:56:57 Done.
396 } 397 }
397 398
398 } // namespace 399 } // namespace
399 400
400 IpcPacketSocketFactory::IpcPacketSocketFactory( 401 IpcPacketSocketFactory::IpcPacketSocketFactory(
401 P2PSocketDispatcher* socket_dispatcher) 402 P2PSocketDispatcher* socket_dispatcher)
402 : socket_dispatcher_(socket_dispatcher) { 403 : socket_dispatcher_(socket_dispatcher) {
403 } 404 }
404 405
405 IpcPacketSocketFactory::~IpcPacketSocketFactory() { 406 IpcPacketSocketFactory::~IpcPacketSocketFactory() {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 return socket.release(); 464 return socket.release();
464 } 465 }
465 466
466 talk_base::AsyncResolverInterface* 467 talk_base::AsyncResolverInterface*
467 IpcPacketSocketFactory::CreateAsyncResolver() { 468 IpcPacketSocketFactory::CreateAsyncResolver() {
468 NOTREACHED(); 469 NOTREACHED();
469 return NULL; 470 return NULL;
470 } 471 }
471 472
472 } // namespace content 473 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.cc ('k') | jingle/glue/channel_socket_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698