| 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 <Foundation/Foundation.h> | 11 #import <Foundation/Foundation.h> |
| 12 | 12 |
| 13 NS_ASSUME_NONNULL_BEGIN | 13 NS_ASSUME_NONNULL_BEGIN |
| 14 // TODO(hjon): Update nullability types. See http://crbug/webrtc/5592 | |
| 15 | 14 |
| 16 @interface RTCIceServer : NSObject | 15 @interface RTCIceServer : NSObject |
| 17 | 16 |
| 18 /** URI(s) for this server represented as NSStrings. */ | 17 /** URI(s) for this server represented as NSStrings. */ |
| 19 @property(nonatomic, readonly, nonnull) NSArray *urlStrings; | 18 @property(nonatomic, readonly) NSArray<NSString *> *urlStrings; |
| 20 // @property(nonatomic, readonly) NSArray<NSString *> *urlStrings; | |
| 21 | 19 |
| 22 /** Username to use if this RTCIceServer object is a TURN server. */ | 20 /** Username to use if this RTCIceServer object is a TURN server. */ |
| 23 @property(nonatomic, readonly, nullable) NSString *username; | 21 @property(nonatomic, readonly, nullable) NSString *username; |
| 24 | 22 |
| 25 /** Credential to use if this RTCIceServer object is a TURN server. */ | 23 /** Credential to use if this RTCIceServer object is a TURN server. */ |
| 26 @property(nonatomic, readonly, nullable) NSString *credential; | 24 @property(nonatomic, readonly, nullable) NSString *credential; |
| 27 | 25 |
| 28 - (nonnull instancetype)init NS_UNAVAILABLE; | 26 - (nonnull instancetype)init NS_UNAVAILABLE; |
| 29 | 27 |
| 30 /** Convenience initializer for a server with no authentication (e.g. STUN). */ | 28 /** Convenience initializer for a server with no authentication (e.g. STUN). */ |
| 31 - (nonnull instancetype)initWithURLStrings:(nonnull NSArray *)urlStrings; | 29 - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings; |
| 32 // - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings; | |
| 33 | 30 |
| 34 /** | 31 /** |
| 35 * Initialize an RTCIceServer with its associated URLs, optional username, | 32 * Initialize an RTCIceServer with its associated URLs, optional username, |
| 36 * optional credential, and credentialType. | 33 * optional credential, and credentialType. |
| 37 */ | 34 */ |
| 38 - (nonnull instancetype)initWithURLStrings:(nonnull NSArray *)urlStrings | 35 - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings |
| 39 // - (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings | 36 username:(nullable NSString *)username |
| 40 username:(nullable NSString *)username | 37 credential:(nullable NSString *)credential |
| 41 credential:(nullable NSString *)credential | |
| 42 NS_DESIGNATED_INITIALIZER; | 38 NS_DESIGNATED_INITIALIZER; |
| 43 | 39 |
| 44 @end | 40 @end |
| 45 | 41 |
| 46 NS_ASSUME_NONNULL_END | 42 NS_ASSUME_NONNULL_END |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1773743002:
Restore type attributes and remove extraneous nullability annotations for Objective-C Mac build (Closed)
Base URL: https://chromium.googlesource.com/external/webrtc.git@master