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

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

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Address final nits. 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 | « webrtc/api/dtmfsender.cc ('k') | webrtc/api/notifier.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 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2011 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
11 #include "webrtc/api/mediastream.h" 11 #include "webrtc/api/mediastream.h"
12 #include "webrtc/base/checks.h"
12 #include "webrtc/base/logging.h" 13 #include "webrtc/base/logging.h"
13 14
14 namespace webrtc { 15 namespace webrtc {
15 16
16 template <class V> 17 template <class V>
17 static typename V::iterator FindTrack(V* vector, 18 static typename V::iterator FindTrack(V* vector,
18 const std::string& track_id) { 19 const std::string& track_id) {
19 typename V::iterator it = vector->begin(); 20 typename V::iterator it = vector->begin();
20 for (; it != vector->end(); ++it) { 21 for (; it != vector->end(); ++it) {
21 if ((*it)->id() == track_id) { 22 if ((*it)->id() == track_id) {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 if (it != tracks->end()) 75 if (it != tracks->end())
75 return false; 76 return false;
76 tracks->push_back(track); 77 tracks->push_back(track);
77 FireOnChanged(); 78 FireOnChanged();
78 return true; 79 return true;
79 } 80 }
80 81
81 template <typename TrackVector> 82 template <typename TrackVector>
82 bool MediaStream::RemoveTrack(TrackVector* tracks, 83 bool MediaStream::RemoveTrack(TrackVector* tracks,
83 MediaStreamTrackInterface* track) { 84 MediaStreamTrackInterface* track) {
84 ASSERT(tracks != NULL); 85 RTC_DCHECK(tracks != NULL);
85 if (!track) 86 if (!track)
86 return false; 87 return false;
87 typename TrackVector::iterator it = FindTrack(tracks, track->id()); 88 typename TrackVector::iterator it = FindTrack(tracks, track->id());
88 if (it == tracks->end()) 89 if (it == tracks->end())
89 return false; 90 return false;
90 tracks->erase(it); 91 tracks->erase(it);
91 FireOnChanged(); 92 FireOnChanged();
92 return true; 93 return true;
93 } 94 }
94 95
95 } // namespace webrtc 96 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/dtmfsender.cc ('k') | webrtc/api/notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698