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

Side by Side Diff: webrtc/api/webrtcsession.cc

Issue 2630553003: Replace left-over ASSERTs in httpcommon.h and webrtcsession.cc. (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/base/httpcommon.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after
2367 2367
2368 void WebRtcSession::DestroyTransport(const std::string& transport_name, 2368 void WebRtcSession::DestroyTransport(const std::string& transport_name,
2369 int component) { 2369 int component) {
2370 network_thread_->Invoke<void>( 2370 network_thread_->Invoke<void>(
2371 RTC_FROM_HERE, 2371 RTC_FROM_HERE,
2372 rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n, 2372 rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n,
2373 transport_controller_.get(), transport_name, component)); 2373 transport_controller_.get(), transport_name, component));
2374 } 2374 }
2375 2375
2376 void WebRtcSession::DestroyRtcpTransport_n(const std::string& transport_name) { 2376 void WebRtcSession::DestroyRtcpTransport_n(const std::string& transport_name) {
2377 ASSERT(network_thread()->IsCurrent()); 2377 RTC_DCHECK(network_thread()->IsCurrent());
2378 transport_controller_->DestroyTransportChannel_n( 2378 transport_controller_->DestroyTransportChannel_n(
2379 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2379 transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2380 } 2380 }
2381 2381
2382 void WebRtcSession::DestroyVideoChannel() { 2382 void WebRtcSession::DestroyVideoChannel() {
2383 SignalVideoChannelDestroyed(); 2383 SignalVideoChannelDestroyed();
2384 RTC_DCHECK(video_channel_->rtp_transport()); 2384 RTC_DCHECK(video_channel_->rtp_transport());
2385 std::string transport_name; 2385 std::string transport_name;
2386 transport_name = video_channel_->rtp_transport()->transport_name(); 2386 transport_name = video_channel_->rtp_transport()->transport_name();
2387 bool need_to_delete_rtcp = (video_channel_->rtcp_transport() != nullptr); 2387 bool need_to_delete_rtcp = (video_channel_->rtcp_transport() != nullptr);
(...skipping 23 matching lines...) Expand all
2411 std::string transport_name; 2411 std::string transport_name;
2412 transport_name = rtp_data_channel_->rtp_transport()->transport_name(); 2412 transport_name = rtp_data_channel_->rtp_transport()->transport_name();
2413 bool need_to_delete_rtcp = (rtp_data_channel_->rtcp_transport() != nullptr); 2413 bool need_to_delete_rtcp = (rtp_data_channel_->rtcp_transport() != nullptr);
2414 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release()); 2414 channel_manager_->DestroyRtpDataChannel(rtp_data_channel_.release());
2415 DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP); 2415 DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTP);
2416 if (need_to_delete_rtcp) { 2416 if (need_to_delete_rtcp) {
2417 DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP); 2417 DestroyTransport(transport_name, cricket::ICE_CANDIDATE_COMPONENT_RTCP);
2418 } 2418 }
2419 } 2419 }
2420 } // namespace webrtc 2420 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/httpcommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698