Changeset 202746 in webkit


Ignore:
Timestamp:
Jul 1, 2016 12:07:20 PM (8 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Get rid of WK_NULLABLE_SPECIFIER now that all supported compilers understand _Nullable
https://bugs.webkit.org/show_bug.cgi?id=159361

Reviewed by Anders Carlsson.

  • Shared/API/Cocoa/WKFoundation.h:
  • UIProcess/API/Cocoa/WKNavigationDelegate.h:
  • UIProcess/API/Cocoa/WKUIDelegate.h:
  • UIProcess/API/Cocoa/WKWebView.h:
  • mac/postprocess-framework-headers.sh:
Location:
trunk/Source/WebKit2
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r202728 r202746  
     12016-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Get rid of WK_NULLABLE_SPECIFIER now that all supported compilers understand _Nullable
     4        https://bugs.webkit.org/show_bug.cgi?id=159361
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/API/Cocoa/WKFoundation.h:
     9        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
     10        * UIProcess/API/Cocoa/WKUIDelegate.h:
     11        * UIProcess/API/Cocoa/WKWebView.h:
     12        * mac/postprocess-framework-headers.sh:
     13
    1142016-07-01  Youenn Fablet  <youennf@gmail.com>
    215
  • trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

    r200874 r202746  
    6565#endif
    6666
    67 #ifdef __OBJC__
    68 #define WK_NULLABLE_SPECIFIER __nullable
    6967#endif
    7068
    71 #endif
    72 
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h

    r195922 r202746  
    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.
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h

    r199558 r202746  
    116116 If you do not implement this method, the web view will behave as if the user selected the Cancel button.
    117117 */
    118 - (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * WK_NULLABLE_SPECIFIER result))completionHandler;
     118- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * _Nullable result))completionHandler;
    119119
    120120#if TARGET_OS_IPHONE
     
    165165 If you do not implement this method, the web view will behave as if the user selected the Cancel button.
    166166 */
    167 - (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(WK_ARRAY(NSURL *) * WK_NULLABLE_SPECIFIER URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
     167- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(WK_ARRAY(NSURL *) * _Nullable URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
    168168
    169169#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

    r200866 r202746  
    219219 @discussion The completionHandler is passed the result of the script evaluation or an error.
    220220*/
    221 - (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^ WK_NULLABLE_SPECIFIER)(WK_NULLABLE_SPECIFIER id, NSError * WK_NULLABLE_SPECIFIER error))completionHandler;
     221- (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^ _Nullable)(_Nullable id, NSError * _Nullable error))completionHandler;
    222222
    223223/*! @abstract A Boolean value indicating whether horizontal swipe gestures
  • trunk/Source/WebKit2/mac/postprocess-framework-headers.sh

    r200891 r202746  
    6262        -e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
    6363        -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
    64         -e s/WK_NULLABLE_SPECIFIER/_Nullable/g
    6564    )
    6665
Note: See TracChangeset for help on using the changeset viewer.