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

Side by Side Diff: webrtc/p2p/base/dtlstransportchannel.cc

Issue 1460043002: Don't call the Pass methods of rtc::Buffer, rtc::scoped_ptr, and rtc::ScopedVector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Restore the Pass methods Created 5 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
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 <utility>
12
11 #include "webrtc/p2p/base/dtlstransportchannel.h" 13 #include "webrtc/p2p/base/dtlstransportchannel.h"
12 14
13 #include "webrtc/p2p/base/common.h" 15 #include "webrtc/p2p/base/common.h"
14 #include "webrtc/base/buffer.h" 16 #include "webrtc/base/buffer.h"
15 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
16 #include "webrtc/base/dscp.h" 18 #include "webrtc/base/dscp.h"
17 #include "webrtc/base/messagequeue.h" 19 #include "webrtc/base/messagequeue.h"
18 #include "webrtc/base/sslstreamadapter.h" 20 #include "webrtc/base/sslstreamadapter.h"
19 #include "webrtc/base/stream.h" 21 #include "webrtc/base/stream.h"
20 #include "webrtc/base/thread.h" 22 #include "webrtc/base/thread.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 219 }
218 220
219 // Otherwise, we must have a local certificate before setting remote 221 // Otherwise, we must have a local certificate before setting remote
220 // fingerprint. 222 // fingerprint.
221 if (!dtls_active_) { 223 if (!dtls_active_) {
222 LOG_J(LS_ERROR, this) << "Can't set DTLS remote settings in this state."; 224 LOG_J(LS_ERROR, this) << "Can't set DTLS remote settings in this state.";
223 return false; 225 return false;
224 } 226 }
225 227
226 // At this point we know we are doing DTLS 228 // At this point we know we are doing DTLS
227 remote_fingerprint_value_ = remote_fingerprint_value.Pass(); 229 remote_fingerprint_value_ = std::move(remote_fingerprint_value);
228 remote_fingerprint_algorithm_ = digest_alg; 230 remote_fingerprint_algorithm_ = digest_alg;
229 231
230 bool reconnect = dtls_; 232 bool reconnect = dtls_;
231 233
232 if (!SetupDtls()) { 234 if (!SetupDtls()) {
233 set_dtls_state(DTLS_TRANSPORT_FAILED); 235 set_dtls_state(DTLS_TRANSPORT_FAILED);
234 return false; 236 return false;
235 } 237 }
236 238
237 if (reconnect) { 239 if (reconnect) {
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
628 630
629 void DtlsTransportChannelWrapper::Reconnect() { 631 void DtlsTransportChannelWrapper::Reconnect() {
630 set_dtls_state(DTLS_TRANSPORT_NEW); 632 set_dtls_state(DTLS_TRANSPORT_NEW);
631 set_writable(false); 633 set_writable(false);
632 if (channel_->writable()) { 634 if (channel_->writable()) {
633 OnWritableState(channel_); 635 OnWritableState(channel_);
634 } 636 }
635 } 637 }
636 638
637 } // namespace cricket 639 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/receiver.cc ('k') | webrtc/p2p/base/dtlstransportchannel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698