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

Side by Side Diff: webrtc/api/jsepicecandidate.h

Issue 2748253003: Pass ownership of candidate to PeerConnection::OnIceCandidate (Closed)
Patch Set: Remove old "OnIceCandidate" and "using" workarounds. Created 3 years, 9 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 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual bool ToString(std::string* out) const; 48 virtual bool ToString(std::string* out) const;
49 49
50 private: 50 private:
51 std::string sdp_mid_; 51 std::string sdp_mid_;
52 int sdp_mline_index_; 52 int sdp_mline_index_;
53 cricket::Candidate candidate_; 53 cricket::Candidate candidate_;
54 54
55 RTC_DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate); 55 RTC_DISALLOW_COPY_AND_ASSIGN(JsepIceCandidate);
56 }; 56 };
57 57
58 rtc::scoped_refptr<JsepIceCandidate> CreateJsepIceCandidate(
59 const std::string& sdp_mid, int sdp_mline_index);
60
61 rtc::scoped_refptr<JsepIceCandidate> CreateJsepIceCandidate(
62 const std::string& sdp_mid, int sdp_mline_index,
63 const cricket::Candidate& candidate);
64
58 // Implementation of IceCandidateCollection which stores JsepIceCandidates. 65 // Implementation of IceCandidateCollection which stores JsepIceCandidates.
59 class JsepCandidateCollection : public IceCandidateCollection { 66 class JsepCandidateCollection : public IceCandidateCollection {
60 public: 67 public:
61 JsepCandidateCollection() {} 68 JsepCandidateCollection() {}
62 // Move constructor is defined so that a vector of JsepCandidateCollections 69 // Move constructor is defined so that a vector of JsepCandidateCollections
63 // can be resized. 70 // can be resized.
64 JsepCandidateCollection(JsepCandidateCollection&& o) 71 JsepCandidateCollection(JsepCandidateCollection&& o)
65 : candidates_(std::move(o.candidates_)) {} 72 : candidates_(std::move(o.candidates_)) {}
66 ~JsepCandidateCollection(); 73 ~JsepCandidateCollection();
67 virtual size_t count() const { 74 virtual size_t count() const {
(...skipping 16 matching lines...) Expand all
84 91
85 private: 92 private:
86 std::vector<JsepIceCandidate*> candidates_; 93 std::vector<JsepIceCandidate*> candidates_;
87 94
88 RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection); 95 RTC_DISALLOW_COPY_AND_ASSIGN(JsepCandidateCollection);
89 }; 96 };
90 97
91 } // namespace webrtc 98 } // namespace webrtc
92 99
93 #endif // WEBRTC_API_JSEPICECANDIDATE_H_ 100 #endif // WEBRTC_API_JSEPICECANDIDATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698