Changeset 195914 in webkit


Ignore:
Timestamp:
Jan 30, 2016 3:50:25 PM (8 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Get rid of WK_ macros for nullability
https://bugs.webkit.org/show_bug.cgi?id=153718

Reviewed by Sam Weinig.

  • Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_ASSUME_NONNULL_{BEGIN, END}, WK_NULLABLE, WK_NULL_UNSPECIFIED, WK_NULLABLE_SPECIFIER, and WK_NULLABLE_PROPERTY.
  • mac/postprocess-framework-headers.sh: Removed rules for rewriting those macros.

Replaced instances of those macros with their expansions, but using the modern _Nullable
instead of nullable:

  • UIProcess/API/Cocoa/WKBackForwardList.h:
  • UIProcess/API/Cocoa/WKBackForwardListItem.h:
  • UIProcess/API/Cocoa/WKError.h:
  • UIProcess/API/Cocoa/WKFrameInfo.h:
  • UIProcess/API/Cocoa/WKNavigationAction.h:
  • UIProcess/API/Cocoa/WKNavigationDelegate.h:
  • UIProcess/API/Cocoa/WKNavigationResponse.h:
  • UIProcess/API/Cocoa/WKScriptMessage.h:
  • UIProcess/API/Cocoa/WKScriptMessageHandler.h:
  • UIProcess/API/Cocoa/WKSecurityOrigin.h:
  • UIProcess/API/Cocoa/WKUIDelegate.h:
  • UIProcess/API/Cocoa/WKUserContentController.h:
  • UIProcess/API/Cocoa/WKUserScript.h:
  • UIProcess/API/Cocoa/WKWebView.h:
  • UIProcess/API/Cocoa/WKWebViewConfiguration.h:
  • UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
  • UIProcess/API/Cocoa/WKWebsiteDataStore.h:
  • UIProcess/API/Cocoa/WKWindowFeatures.h:
  • UIProcess/API/Cocoa/_WKContextMenuElementInfo.h:
  • UIProcess/API/Cocoa/_WKElementInfo.h:
  • UIProcess/API/Cocoa/_WKPreviewElementInfo.h:
  • UIProcess/API/Cocoa/_WKUserStyleSheet.h:
Location:
trunk/Source/WebKit2
Files:
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r195911 r195914  
     12016-01-30  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Get rid of WK_ macros for nullability
     4        https://bugs.webkit.org/show_bug.cgi?id=153718
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_ASSUME_NONNULL_{BEGIN, END},
     9          WK_NULLABLE, WK_NULL_UNSPECIFIED, WK_NULLABLE_SPECIFIER, and WK_NULLABLE_PROPERTY.
     10
     11        * mac/postprocess-framework-headers.sh: Removed rules for rewriting those macros.
     12
     13        Replaced instances of those macros with their expansions, but using the modern _Nullable
     14        instead of __nullable:
     15
     16        * UIProcess/API/Cocoa/WKBackForwardList.h:
     17        * UIProcess/API/Cocoa/WKBackForwardListItem.h:
     18        * UIProcess/API/Cocoa/WKError.h:
     19        * UIProcess/API/Cocoa/WKFrameInfo.h:
     20        * UIProcess/API/Cocoa/WKNavigationAction.h:
     21        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
     22        * UIProcess/API/Cocoa/WKNavigationResponse.h:
     23        * UIProcess/API/Cocoa/WKScriptMessage.h:
     24        * UIProcess/API/Cocoa/WKScriptMessageHandler.h:
     25        * UIProcess/API/Cocoa/WKSecurityOrigin.h:
     26        * UIProcess/API/Cocoa/WKUIDelegate.h:
     27        * UIProcess/API/Cocoa/WKUserContentController.h:
     28        * UIProcess/API/Cocoa/WKUserScript.h:
     29        * UIProcess/API/Cocoa/WKWebView.h:
     30        * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
     31        * UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
     32        * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
     33        * UIProcess/API/Cocoa/WKWindowFeatures.h:
     34        * UIProcess/API/Cocoa/_WKContextMenuElementInfo.h:
     35        * UIProcess/API/Cocoa/_WKElementInfo.h:
     36        * UIProcess/API/Cocoa/_WKPreviewElementInfo.h:
     37        * UIProcess/API/Cocoa/_WKUserStyleSheet.h:
     38
    1392016-01-30  Darin Adler  <darin@apple.com>
    240
  • trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

    r194880 r195914  
    8383#endif
    8484
    85 #if __has_feature(assume_nonnull)
    86 
    87 #ifdef NS_ASSUME_NONNULL_BEGIN
    88 #define WK_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
    89 #else
    90 #define WK_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
    91 #endif
    92 
    93 #ifdef NS_ASSUME_NONNULL_END
    94 #define WK_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
    95 #else
    96 #define WK_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
    97 #endif
    98 
    99 #define WK_NULLABLE nullable
    100 #define WK_NULL_UNSPECIFIED null_unspecified
    101 #define WK_NULLABLE_SPECIFIER __nullable
    102 #define WK_NULLABLE_PROPERTY nullable,
    103 
    104 #else
    105 
    106 #define WK_ASSUME_NONNULL_BEGIN
    107 #define WK_ASSUME_NONNULL_END
    108 
    109 #define WK_NULLABLE
    110 #define WK_NULL_UNSPECIFIED
    111 #define WK_NULLABLE_SPECIFIER
    112 #define WK_NULLABLE_PROPERTY
    113 
    11485#endif
    11586
    11687#endif
    11788
    118 #endif
    119 
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h

    r183152 r195914  
    3333 visited in a web view that can be reached by going back or forward.
    3434 */
    35 WK_ASSUME_NONNULL_BEGIN
     35NS_ASSUME_NONNULL_BEGIN
    3636
    3737WK_CLASS_AVAILABLE(10_10, 8_0)
     
    4040/*! @abstract The current item.
    4141 */
    42 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, strong) WKBackForwardListItem *currentItem;
     42@property (nullable, nonatomic, readonly, strong) WKBackForwardListItem *currentItem;
    4343
    4444/*! @abstract The item immediately preceding the current item, or nil
    4545if there isn't one.
    4646 */
    47 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, strong) WKBackForwardListItem *backItem;
     47@property (nullable, nonatomic, readonly, strong) WKBackForwardListItem *backItem;
    4848
    4949/*! @abstract The item immediately following the current item, or nil
    5050if there isn't one.
    5151 */
    52 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, strong) WKBackForwardListItem *forwardItem;
     52@property (nullable, nonatomic, readonly, strong) WKBackForwardListItem *forwardItem;
    5353
    5454/*! @abstract Returns the item at a specified distance from the current
     
    6060 if the index parameter exceeds the limits of the list.
    6161 */
    62 - (WK_NULLABLE WKBackForwardListItem *)itemAtIndex:(NSInteger)index;
     62- (nullable WKBackForwardListItem *)itemAtIndex:(NSInteger)index;
    6363
    6464/*! @abstract The portion of the list preceding the current item.
     
    7676@end
    7777
    78 WK_ASSUME_NONNULL_END
     78NS_ASSUME_NONNULL_END
    7979
    8080#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h

    r180162 r195914  
    3232/*! A WKBackForwardListItem object represents a webpage in the back-forward list of a web view.
    3333 */
    34 WK_ASSUME_NONNULL_BEGIN
     34NS_ASSUME_NONNULL_BEGIN
    3535
    3636WK_CLASS_AVAILABLE(10_10, 8_0)
     
    4343/*! @abstract The title of the webpage represented by this item.
    4444 */
    45 @property (WK_NULLABLE_PROPERTY readonly, copy) NSString *title;
     45@property (nullable, readonly, copy) NSString *title;
    4646
    4747/*! @abstract The URL of the initial request that created this item.
     
    5151@end
    5252
    53 WK_ASSUME_NONNULL_END
     53NS_ASSUME_NONNULL_END
    5454
    5555#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKError.h

    r189547 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434/*! @constant WKErrorDomain Indicates a WebKit error. */
     
    5151} WK_ENUM_AVAILABLE(10_10, 8_0);
    5252
    53 WK_ASSUME_NONNULL_END
     53NS_ASSUME_NONNULL_END
    5454
    5555#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.h

    r189547 r195914  
    3636 calls.
    3737 */
    38 WK_ASSUME_NONNULL_BEGIN
     38NS_ASSUME_NONNULL_BEGIN
    3939
    4040WK_CLASS_AVAILABLE(10_10, 8_0)
     
    5656@end
    5757
    58 WK_ASSUME_NONNULL_END
     58NS_ASSUME_NONNULL_END
    5959
    6060#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h

    r180162 r195914  
    3434#endif
    3535
    36 WK_ASSUME_NONNULL_BEGIN
     36NS_ASSUME_NONNULL_BEGIN
    3737
    3838@class WKFrameInfo;
     
    6868/*! @abstract The target frame, or nil if this is a new window navigation.
    6969 */
    70 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, copy) WKFrameInfo *targetFrame;
     70@property (nullable, nonatomic, readonly, copy) WKFrameInfo *targetFrame;
    7171
    7272/*! @abstract The type of action that triggered the navigation.
     
    9393@end
    9494
    95 WK_ASSUME_NONNULL_END
     95NS_ASSUME_NONNULL_END
    9696
    9797#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h

    r189547 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKNavigation;
     
    9191 @param navigation The navigation.
    9292 */
    93 - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WK_NULL_UNSPECIFIED WKNavigation *)navigation;
     93- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(null_unspecified WKNavigation *)navigation;
    9494
    9595/*! @abstract Invoked when a server redirect is received for the main
     
    9898 @param navigation The navigation.
    9999 */
    100 - (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WK_NULL_UNSPECIFIED WKNavigation *)navigation;
     100- (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(null_unspecified WKNavigation *)navigation;
    101101
    102102/*! @abstract Invoked when an error occurs while starting to load data for
     
    106106 @param error The error that occurred.
    107107 */
    108 - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WK_NULL_UNSPECIFIED WKNavigation *)navigation withError:(NSError *)error;
     108- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error;
    109109
    110110/*! @abstract Invoked when content starts arriving for the main frame.
     
    112112 @param navigation The navigation.
    113113 */
    114 - (void)webView:(WKWebView *)webView didCommitNavigation:(WK_NULL_UNSPECIFIED WKNavigation *)navigation;
     114- (void)webView:(WKWebView *)webView didCommitNavigation:(null_unspecified WKNavigation *)navigation;
    115115
    116116/*! @abstract Invoked when a main frame navigation completes.
     
    118118 @param navigation The navigation.
    119119 */
    120 - (void)webView:(WKWebView *)webView didFinishNavigation:(WK_NULL_UNSPECIFIED WKNavigation *)navigation;
     120- (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation;
    121121
    122122/*! @abstract Invoked when an error occurs during a committed main frame
     
    126126 @param error The error that occurred.
    127127 */
    128 - (void)webView:(WKWebView *)webView didFailNavigation:(WK_NULL_UNSPECIFIED WKNavigation *)navigation withError:(NSError *)error;
     128- (void)webView:(WKWebView *)webView didFailNavigation:(null_unspecified WKNavigation *)navigation withError:(NSError *)error;
    129129
    130130/*! @abstract Invoked when the web view needs to respond to an authentication challenge.
     
    138138 @discussion If you do not implement this method, the web view will respond to the authentication challenge with the NSURLSessionAuthChallengeRejectProtectionSpace disposition.
    139139 */
    140 - (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *WK_NULLABLE_SPECIFIER credential))completionHandler;
     140- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *_Nullable credential))completionHandler;
    141141
    142142/*! @abstract Invoked when the web view's web content process is terminated.
     
    147147@end
    148148
    149 WK_ASSUME_NONNULL_END
     149NS_ASSUME_NONNULL_END
    150150
    151151#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h

    r180162 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKFrameInfo;
     
    5454@end
    5555
    56 WK_ASSUME_NONNULL_END
     56NS_ASSUME_NONNULL_END
    5757
    5858#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h

    r180162 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKFrameInfo;
     
    4848
    4949/*! @abstract The web view sending the message. */
    50 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, weak) WKWebView *webView;
     50@property (nullable, nonatomic, readonly, weak) WKWebView *webView;
    5151
    5252/*! @abstract The frame sending the message. */
     
    5959@end
    6060
    61 WK_ASSUME_NONNULL_END
     61NS_ASSUME_NONNULL_END
    6262
    6363#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h

    r180162 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKScriptMessage;
     
    5151@end
    5252
    53 WK_ASSUME_NONNULL_END
     53NS_ASSUME_NONNULL_END
    5454
    5555#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h

    r189547 r195914  
    3535 calls.
    3636 */
    37 WK_ASSUME_NONNULL_BEGIN
     37NS_ASSUME_NONNULL_BEGIN
    3838
    3939WK_CLASS_AVAILABLE(10_11, 9_0)
     
    5656@end
    5757
    58 WK_ASSUME_NONNULL_END
     58NS_ASSUME_NONNULL_END
    5959
    6060#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h

    r189547 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKFrameInfo;
     
    5656 If you do not implement this method, the web view will cancel the navigation.
    5757 */
    58 - (WK_NULLABLE WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures;
     58- (nullable WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures;
    5959
    6060/*! @abstract Notifies your app that the DOM window object's close() method completed successfully.
     
    113113 If you do not implement this method, the web view will behave as if the user selected the Cancel button.
    114114 */
    115 - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(WK_NULLABLE NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * WK_NULLABLE_SPECIFIER result))completionHandler;
     115- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * _Nullable result))completionHandler;
    116116
    117117@end
    118118
    119 WK_ASSUME_NONNULL_END
     119NS_ASSUME_NONNULL_END
    120120
    121121#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h

    r183152 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKUserScript;
     
    7373@end
    7474
    75 WK_ASSUME_NONNULL_END
     75NS_ASSUME_NONNULL_END
    7676
    7777#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h

    r180162 r195914  
    3535 @constant WKUserScriptInjectionTimeAtDocumentEnd      Inject the script after the document has finished loading, but before any subresources may have finished loading.
    3636 */
    37 WK_ASSUME_NONNULL_BEGIN
     37NS_ASSUME_NONNULL_BEGIN
    3838
    3939typedef NS_ENUM(NSInteger, WKUserScriptInjectionTime) {
     
    6565@end
    6666
    67 WK_ASSUME_NONNULL_END
     67NS_ASSUME_NONNULL_END
    6868
    6969#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

    r191228 r195914  
    3434#endif
    3535
    36 WK_ASSUME_NONNULL_BEGIN
     36NS_ASSUME_NONNULL_BEGIN
    3737
    3838@class WKBackForwardList;
     
    6262
    6363/*! @abstract The web view's navigation delegate. */
    64 @property (WK_NULLABLE_PROPERTY nonatomic, weak) id <WKNavigationDelegate> navigationDelegate;
     64@property (nullable, nonatomic, weak) id <WKNavigationDelegate> navigationDelegate;
    6565
    6666/*! @abstract The web view's user interface delegate. */
    67 @property (WK_NULLABLE_PROPERTY nonatomic, weak) id <WKUIDelegate> UIDelegate;
     67@property (nullable, nonatomic, weak) id <WKUIDelegate> UIDelegate;
    6868
    6969/*! @abstract The web view's back-forward list. */
     
    9090 @result A new navigation for the given request.
    9191 */
    92 - (WK_NULLABLE WKNavigation *)loadRequest:(NSURLRequest *)request;
     92- (nullable WKNavigation *)loadRequest:(NSURLRequest *)request;
    9393
    9494/*! @abstract Navigates to the requested file URL on the filesystem.
     
    9999 @result A new navigation for the given file URL.
    100100 */
    101 - (WK_NULLABLE WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(10_11, 9_0);
     101- (nullable WKNavigation *)loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL WK_AVAILABLE(10_11, 9_0);
    102102
    103103/*! @abstract Sets the webpage contents and base URL.
     
    106106 @result A new navigation.
    107107 */
    108 - (WK_NULLABLE WKNavigation *)loadHTMLString:(NSString *)string baseURL:(WK_NULLABLE NSURL *)baseURL;
     108- (nullable WKNavigation *)loadHTMLString:(NSString *)string baseURL:(nullable NSURL *)baseURL;
    109109
    110110/*! @abstract Sets the webpage contents and base URL.
     
    115115 @result A new navigation.
    116116 */
    117 - (WK_NULLABLE WKNavigation *)loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL WK_AVAILABLE(10_11, 9_0);
     117- (nullable WKNavigation *)loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL WK_AVAILABLE(10_11, 9_0);
    118118
    119119/*! @abstract Navigates to an item from the back-forward list and sets it
     
    125125 @seealso backForwardList
    126126 */
    127 - (WK_NULLABLE WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item;
     127- (nullable WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item;
    128128
    129129/*! @abstract The page title.
     
    131131 for this property.
    132132 */
    133 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, copy) NSString *title;
     133@property (nullable, nonatomic, readonly, copy) NSString *title;
    134134
    135135/*! @abstract The active URL.
     
    139139 property.
    140140 */
    141 @property (WK_NULLABLE_PROPERTY nonatomic, readonly, copy) NSURL *URL;
     141@property (nullable, nonatomic, readonly, copy) NSURL *URL;
    142142
    143143/*! @abstract A Boolean value indicating whether the view is currently
     
    192192 item in the back-forward list.
    193193 */
    194 - (WK_NULLABLE WKNavigation *)goBack;
     194- (nullable WKNavigation *)goBack;
    195195
    196196/*! @abstract Navigates to the forward item in the back-forward list.
     
    198198 forward item in the back-forward list.
    199199 */
    200 - (WK_NULLABLE WKNavigation *)goForward;
     200- (nullable WKNavigation *)goForward;
    201201
    202202/*! @abstract Reloads the current page.
    203203 @result A new navigation representing the reload.
    204204 */
    205 - (WK_NULLABLE WKNavigation *)reload;
     205- (nullable WKNavigation *)reload;
    206206
    207207/*! @abstract Reloads the current page, performing end-to-end revalidation
     
    209209 @result A new navigation representing the reload.
    210210 */
    211 - (WK_NULLABLE WKNavigation *)reloadFromOrigin;
     211- (nullable WKNavigation *)reloadFromOrigin;
    212212
    213213/*! @abstract Stops loading all resources on the current page.
     
    220220 @discussion The completionHandler is passed the result of the script evaluation or an error.
    221221*/
    222 - (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^ WK_NULLABLE_SPECIFIER)(WK_NULLABLE_SPECIFIER id, NSError * WK_NULLABLE_SPECIFIER error))completionHandler;
     222- (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^ _Nullable)(_Nullable id, NSError * _Nullable error))completionHandler;
    223223
    224224/*! @abstract A Boolean value indicating whether horizontal swipe gestures
     
    230230/*! @abstract The custom user agent string or nil if no custom user agent string has been set.
    231231*/
    232 @property (WK_NULLABLE_PROPERTY nonatomic, copy) NSString *customUserAgent WK_AVAILABLE(10_11, 9_0);
     232@property (nullable, nonatomic, copy) NSString *customUserAgent WK_AVAILABLE(10_11, 9_0);
    233233
    234234/*! @abstract A Boolean value indicating whether link preview is allowed for any
     
    277277 @param sender The object that sent this message.
    278278 */
    279 - (IBAction)goBack:(WK_NULLABLE id)sender;
     279- (IBAction)goBack:(nullable id)sender;
    280280
    281281/*! @abstract Action method that navigates to the forward item in the
     
    283283 @param sender The object that sent this message.
    284284 */
    285 - (IBAction)goForward:(WK_NULLABLE id)sender;
     285- (IBAction)goForward:(nullable id)sender;
    286286
    287287/*! @abstract Action method that reloads the current page.
    288288 @param sender The object that sent this message.
    289289 */
    290 - (IBAction)reload:(WK_NULLABLE id)sender;
     290- (IBAction)reload:(nullable id)sender;
    291291
    292292/*! @abstract Action method that reloads the current page, performing
     
    294294 @param sender The object that sent this message.
    295295 */
    296 - (IBAction)reloadFromOrigin:(WK_NULLABLE id)sender;
     296- (IBAction)reloadFromOrigin:(nullable id)sender;
    297297
    298298/*! @abstract Action method that stops loading all resources on the current
     
    300300 @param sender The object that sent this message.
    301301 */
    302 - (IBAction)stopLoading:(WK_NULLABLE id)sender;
     302- (IBAction)stopLoading:(nullable id)sender;
    303303
    304304@end
     
    306306#endif
    307307
    308 WK_ASSUME_NONNULL_END
    309 
    310 #endif
     308NS_ASSUME_NONNULL_END
     309
     310#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h

    r195317 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434@class WKPreferences;
     
    106106/*! @abstract The name of the application as used in the user agent string.
    107107*/
    108 @property (WK_NULLABLE_PROPERTY nonatomic, copy) NSString *applicationNameForUserAgent WK_AVAILABLE(10_11, 9_0);
     108@property (nullable, nonatomic, copy) NSString *applicationNameForUserAgent WK_AVAILABLE(10_11, 9_0);
    109109
    110110/*! @abstract A Boolean value indicating whether AirPlay is allowed.
     
    161161@end
    162162
    163 WK_ASSUME_NONNULL_END
     163NS_ASSUME_NONNULL_END
    164164
    165165#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h

    r189547 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434/*! @constant WKWebsiteDataTypeDiskCache On-disk caches. */
     
    6868@end
    6969
    70 WK_ASSUME_NONNULL_END
     70NS_ASSUME_NONNULL_END
    7171
    7272#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h

    r189547 r195914  
    3030#import <WebKit/WKWebsiteDataRecord.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434/*! A WKWebsiteDataStore represents various types of data that a website might
     
    7878@end
    7979
    80 WK_ASSUME_NONNULL_END
     80NS_ASSUME_NONNULL_END
    8181
    8282#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWindowFeatures.h

    r180162 r195914  
    3232/*! WKWindowFeatures specifies optional attributes for the containing window when a new WKWebView is requested.
    3333 */
    34 WK_ASSUME_NONNULL_BEGIN
     34NS_ASSUME_NONNULL_BEGIN
    3535
    3636WK_CLASS_AVAILABLE(10_10, 8_0)
     
    3939/*! @abstract BOOL. Whether the menu bar should be visible. nil if menu bar visibility was not specified.
    4040 */
    41 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *menuBarVisibility;
     41@property (nullable, nonatomic, readonly) NSNumber *menuBarVisibility;
    4242
    4343/*! @abstract BOOL. Whether the status bar should be visible. nil if status bar visibility was not specified.
    4444 */
    45 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *statusBarVisibility;
     45@property (nullable, nonatomic, readonly) NSNumber *statusBarVisibility;
    4646
    4747/*! @abstract BOOL. Whether toolbars should be visible. nil if toolbar visibility was not specified.
    4848 */
    49 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *toolbarsVisibility;
     49@property (nullable, nonatomic, readonly) NSNumber *toolbarsVisibility;
    5050
    5151/*! @abstract BOOL. Whether the containing window should be resizable. nil if resizability was not specified.
    5252 */
    53 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *allowsResizing;
     53@property (nullable, nonatomic, readonly) NSNumber *allowsResizing;
    5454
    5555/*! @abstract CGFloat. The x coordinate of the containing window. nil if the x coordinate was not specified.
    5656 */
    57 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *x;
     57@property (nullable, nonatomic, readonly) NSNumber *x;
    5858
    5959/*! @abstract CGFloat. The y coordinate of the containing window. nil if the y coordinate was not specified.
    6060 */
    61 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *y;
     61@property (nullable, nonatomic, readonly) NSNumber *y;
    6262
    6363/*! @abstract CGFloat. The width coordinate of the containing window. nil if the width was not specified.
    6464 */
    65 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *width;
     65@property (nullable, nonatomic, readonly) NSNumber *width;
    6666
    6767/*! @abstract CGFloat. The height coordinate of the containing window. nil if the height was not specified.
    6868 */
    69 @property (WK_NULLABLE_PROPERTY nonatomic, readonly) NSNumber *height;
     69@property (nullable, nonatomic, readonly) NSNumber *height;
    7070
    7171@end
    7272
    73 WK_ASSUME_NONNULL_END
     73NS_ASSUME_NONNULL_END
    7474
    7575#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKContextMenuElementInfo.h

    r191685 r195914  
    3030#import <WebKit/_WKElementInfo.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434WK_CLASS_AVAILABLE(WK_MAC_TBA, NA)
     
    3737@end
    3838
    39 WK_ASSUME_NONNULL_END
     39NS_ASSUME_NONNULL_END
    4040
    4141#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementInfo.h

    r192486 r195914  
    2828#if WK_API_ENABLED
    2929
    30 WK_ASSUME_NONNULL_BEGIN
     30NS_ASSUME_NONNULL_BEGIN
    3131
    3232WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     
    3737@end
    3838
    39 WK_ASSUME_NONNULL_END
     39NS_ASSUME_NONNULL_END
    4040
    4141#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKPreviewElementInfo.h

    r192486 r195914  
    3030#import <WebKit/_WKElementInfo.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434WK_CLASS_AVAILABLE(NA, WK_IOS_TBA)
     
    3737@end
    3838
    39 WK_ASSUME_NONNULL_END
     39NS_ASSUME_NONNULL_END
    4040
    4141#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h

    r191588 r195914  
    3030#import <Foundation/Foundation.h>
    3131
    32 WK_ASSUME_NONNULL_BEGIN
     32NS_ASSUME_NONNULL_BEGIN
    3333
    3434WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
     
    4343@end
    4444
    45 WK_ASSUME_NONNULL_END
     45NS_ASSUME_NONNULL_END
    4646
    4747#endif
  • trunk/Source/WebKit2/mac/postprocess-framework-headers.sh

    r194821 r195914  
    6262        -e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
    6363        -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
    64         -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/
    65         -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/
    6664        -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/
    67         -e s/WK_NULLABLE_PROPERTY/nullable,/
    68         -e s/WK_NULLABLE_SPECIFIER/__nullable/g
    69         -e s/WK_NULLABLE/nullable/g
    70         -e s/WK_NULL_UNSPECIFIED/null_unspecified/
    7165        -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/
    7266    )
Note: See TracChangeset for help on using the changeset viewer.