Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 #import "RTCIceServer.h" | 11 #import "RTCIceCandidate.h" |
| 12 | 12 |
| 13 #include "talk/app/webrtc/peerconnectioninterface.h" | 13 #include "webrtc/base/scoped_ptr.h" |
| 14 #include "talk/app/webrtc/jsep.h" | |
| 14 | 15 |
| 15 NS_ASSUME_NONNULL_BEGIN | 16 NS_ASSUME_NONNULL_BEGIN |
| 16 | 17 |
| 17 @interface RTCIceServer () | 18 @interface RTCIceCandidate () |
| 18 | 19 |
| 19 /** | 20 /** |
| 20 * IceServer struct representation of this RTCIceServer object's data. | 21 * The native IceCandidateInterface representation of this RTCIceCandidate |
| 21 * This is needed to pass to the underlying C++ APIs. | 22 * object. This is needed to pass to the underlying C++ APIs. |
| 22 */ | 23 */ |
| 23 @property(nonatomic, readonly) | 24 @property(nonatomic, readonly) |
| 24 webrtc::PeerConnectionInterface::IceServer iceServer; | 25 rtc::scoped_ptr<webrtc::IceCandidateInterface> candidate; |
|
tkchin_webrtc
2015/12/15 01:55:44
nit: let's give the C++ a "native" prefix
so call
hjon
2015/12/15 17:35:44
Done.
| |
| 26 | |
| 27 /** | |
| 28 * Initialize an RTCIceCandidate from a native IceCandidateInterface. | |
|
tkchin_webrtc
2015/12/15 01:55:44
add that no ownership is taken
hjon
2015/12/15 17:35:44
Done.
| |
| 29 */ | |
| 30 - (instancetype)initWithCandidate:(webrtc::IceCandidateInterface *)candidate; | |
| 25 | 31 |
| 26 @end | 32 @end |
| 27 | 33 |
| 28 NS_ASSUME_NONNULL_END | 34 NS_ASSUME_NONNULL_END |
| OLD | NEW |