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

Unified Diff: trunk/src/content/browser/renderer_host/p2p/socket_dispatcher_host.cc

Issue 307063003: Revert 273745 "Implements RTP header dumping." due to memory leak (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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: trunk/src/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
===================================================================
--- trunk/src/content/browser/renderer_host/p2p/socket_dispatcher_host.cc (revision 273764)
+++ trunk/src/content/browser/renderer_host/p2p/socket_dispatcher_host.cc (working copy)
@@ -99,9 +99,7 @@
: BrowserMessageFilter(P2PMsgStart),
resource_context_(resource_context),
url_context_(url_context),
- monitoring_networks_(false),
- dump_incoming_rtp_packet_(false),
- dump_outgoing_rtp_packet_(false) {
+ monitoring_networks_(false) {
}
void P2PSocketDispatcherHost::OnChannelClosing() {
@@ -148,38 +146,6 @@
&P2PSocketDispatcherHost::DoGetNetworkList, this));
}
-void P2PSocketDispatcherHost::StartRtpDump(
- bool incoming,
- bool outgoing,
- const RenderProcessHost::WebRtcRtpPacketCallback& packet_callback) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
- if ((!dump_incoming_rtp_packet_ && incoming) ||
- (!dump_outgoing_rtp_packet_ && outgoing)) {
- if (incoming)
- dump_incoming_rtp_packet_ = true;
-
- if (outgoing)
- dump_outgoing_rtp_packet_ = true;
-
- packet_callback_ = packet_callback;
- for (SocketsMap::iterator it = sockets_.begin(); it != sockets_.end(); ++it)
- it->second->StartRtpDump(incoming, outgoing, packet_callback);
- }
-}
-
-void P2PSocketDispatcherHost::StopRtpDumpOnUIThread(bool incoming,
- bool outgoing) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(&P2PSocketDispatcherHost::StopRtpDumpOnIOThread,
- this,
- incoming,
- outgoing));
-}
-
P2PSocketDispatcherHost::~P2PSocketDispatcherHost() {
DCHECK(sockets_.empty());
DCHECK(dns_requests_.empty());
@@ -241,12 +207,6 @@
if (socket->Init(local_address, remote_address)) {
sockets_[socket_id] = socket.release();
-
- if (dump_incoming_rtp_packet_ || dump_outgoing_rtp_packet_) {
- sockets_[socket_id]->StartRtpDump(dump_incoming_rtp_packet_,
- dump_outgoing_rtp_packet_,
- packet_callback_);
- }
}
}
@@ -334,22 +294,4 @@
delete request;
}
-void P2PSocketDispatcherHost::StopRtpDumpOnIOThread(bool incoming,
- bool outgoing) {
- if ((dump_incoming_rtp_packet_ && incoming) ||
- (dump_outgoing_rtp_packet_ && outgoing)) {
- if (incoming)
- dump_incoming_rtp_packet_ = false;
-
- if (outgoing)
- dump_outgoing_rtp_packet_ = false;
-
- if (!dump_incoming_rtp_packet_ && !dump_outgoing_rtp_packet_)
- packet_callback_.Reset();
-
- for (SocketsMap::iterator it = sockets_.begin(); it != sockets_.end(); ++it)
- it->second->StopRtpDump(incoming, outgoing);
- }
-}
-
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698