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

Side by Side Diff: webrtc/pc/quicdatachannel.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 cricket::ReliableQuicStream* stream = kv.second; 218 cricket::ReliableQuicStream* stream = kv.second;
219 stream->Close(); 219 stream->Close();
220 } 220 }
221 } 221 }
222 222
223 bool QuicDataChannel::SetTransportChannel( 223 bool QuicDataChannel::SetTransportChannel(
224 cricket::QuicTransportChannel* channel) { 224 cricket::QuicTransportChannel* channel) {
225 RTC_DCHECK(signaling_thread_->IsCurrent()); 225 RTC_DCHECK(signaling_thread_->IsCurrent());
226 226
227 if (!channel) { 227 if (!channel) {
228 LOG(LS_ERROR) << "|channel| is NULL. Cannot set transport channel."; 228 LOG(LS_ERROR) << "|channel| is null. Cannot set transport channel.";
229 return false; 229 return false;
230 } 230 }
231 if (quic_transport_channel_) { 231 if (quic_transport_channel_) {
232 if (channel == quic_transport_channel_) { 232 if (channel == quic_transport_channel_) {
233 LOG(LS_WARNING) << "Ignoring duplicate transport channel."; 233 LOG(LS_WARNING) << "Ignoring duplicate transport channel.";
234 return true; 234 return true;
235 } 235 }
236 LOG(LS_ERROR) << "|channel| does not match existing transport channel."; 236 LOG(LS_ERROR) << "|channel| does not match existing transport channel.";
237 return false; 237 return false;
238 } 238 }
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 387
388 size_t QuicDataChannel::GetNumWriteBlockedStreams() const { 388 size_t QuicDataChannel::GetNumWriteBlockedStreams() const {
389 return write_blocked_quic_streams_.size(); 389 return write_blocked_quic_streams_.size();
390 } 390 }
391 391
392 size_t QuicDataChannel::GetNumIncomingStreams() const { 392 size_t QuicDataChannel::GetNumIncomingStreams() const {
393 return incoming_quic_messages_.size(); 393 return incoming_quic_messages_.size();
394 } 394 }
395 395
396 } // namespace webrtc 396 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698