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

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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 DCHECK_EQ(base::MessageLoop::current(), message_loop_); 387 DCHECK_EQ(base::MessageLoop::current(), message_loop_);
388 388
389 talk_base::SocketAddress address_lj; 389 talk_base::SocketAddress address_lj;
390 if (!jingle_glue::IPEndPointToSocketAddress(address, &address_lj)) { 390 if (!jingle_glue::IPEndPointToSocketAddress(address, &address_lj)) {
391 // We should always be able to convert address here because we 391 // We should always be able to convert address here because we
392 // don't expect IPv6 address on IPv4 connections. 392 // don't expect IPv6 address on IPv4 connections.
393 NOTREACHED(); 393 NOTREACHED();
394 return; 394 return;
395 } 395 }
396 396
397 // TODO(mallinath) - Pass timestamp after updating the libjingle. 397 SignalReadPacket(this, &data[0], data.size(), address_lj,
398 // talk_base::PacketTime packet_time(timestamp.ToInternalValue(), 0); 398 timestamp);
Mallinath (Gone from Chromium) 2013/12/16 17:00:55 SignalReadPacket takes PacketTime as argument, not
Ronghua Wu (Left Chromium) 2013/12/17 00:41:02 Yea, I realized that and done in the 3rd patch.
399 SignalReadPacket(this, &data[0], data.size(), address_lj);
400 } 399 }
401 400
402 } // namespace 401 } // namespace
403 402
404 IpcPacketSocketFactory::IpcPacketSocketFactory( 403 IpcPacketSocketFactory::IpcPacketSocketFactory(
405 P2PSocketDispatcher* socket_dispatcher) 404 P2PSocketDispatcher* socket_dispatcher)
406 : socket_dispatcher_(socket_dispatcher) { 405 : socket_dispatcher_(socket_dispatcher) {
407 } 406 }
408 407
409 IpcPacketSocketFactory::~IpcPacketSocketFactory() { 408 IpcPacketSocketFactory::~IpcPacketSocketFactory() {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 return socket.release(); 466 return socket.release();
468 } 467 }
469 468
470 talk_base::AsyncResolverInterface* 469 talk_base::AsyncResolverInterface*
471 IpcPacketSocketFactory::CreateAsyncResolver() { 470 IpcPacketSocketFactory::CreateAsyncResolver() {
472 NOTREACHED(); 471 NOTREACHED();
473 return NULL; 472 return NULL;
474 } 473 }
475 474
476 } // namespace content 475 } // 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