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 "RTCIceCandidate.h" | 11 #import "RTCSessionDescription.h" |
| 12 | 12 |
| 13 #include "webrtc/base/scoped_ptr.h" | |
| 14 #include "talk/app/webrtc/jsep.h" | 13 #include "talk/app/webrtc/jsep.h" |
| 15 | 14 |
| 16 NS_ASSUME_NONNULL_BEGIN | 15 NS_ASSUME_NONNULL_BEGIN |
| 17 | 16 |
| 18 @interface RTCIceCandidate () | 17 @interface RTCSessionDescription () |
| 19 | 18 |
| 20 /** | 19 /** |
| 21 * The native IceCandidateInterface representation of this RTCIceCandidate | 20 * The native SessionDescriptionInterface representation of this |
| 22 * object. This is needed to pass to the underlying C++ APIs. | 21 * RTCSessionDescription object. This is needed to pass to the underlying C++ |
| 22 * APIs. | |
| 23 */ | 23 */ |
| 24 @property(nonatomic, readonly) | 24 @property(nonatomic, readonly) |
| 25 rtc::scoped_ptr<webrtc::IceCandidateInterface> nativeCandidate; | 25 webrtc::SessionDescriptionInterface *nativeDescription; |
| 26 | 26 |
| 27 /** | 27 /** |
| 28 * Initialize an RTCIceCandidate from a native IceCandidateInterface. No | 28 * Initialize an RTCSessionDescription from a native |
| 29 * ownership is taken of the native candidate. | 29 * SessionDescriptionInterface. No ownership is taken of the native session |
| 30 * description. | |
| 30 */ | 31 */ |
| 31 - (instancetype)initWithCandidate:(webrtc::IceCandidateInterface *)candidate; | 32 - (instancetype)initWithDescription:(webrtc::SessionDescriptionInterface *) |
|
tkchin_webrtc
2016/01/05 16:29:18
ditto break after :
hjon
2016/01/05 22:16:20
Done.
| |
| 33 description; | |
| 32 | 34 |
| 33 @end | 35 @end |
| 34 | 36 |
| 35 NS_ASSUME_NONNULL_END | 37 NS_ASSUME_NONNULL_END |
| OLD | NEW |