Changeset 181859 in webkit

Timestamp:

Mar 23, 2015, 12:13:29 PM (11 years ago)

Author:

andersca@apple.com

Message:

Put the WK_NULLABLE_SPECIFIER in the right place for block parameters
​https://bugs.webkit.org/show_bug.cgi?id=142975
rdar://problem/19863930

Reviewed by Dan Bernstein.

• UIProcess/API/Cocoa/WKNavigationDelegate.h:
• UIProcess/API/Cocoa/WKUIDelegate.h:
• UIProcess/API/Cocoa/WKWebView.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKNavigationDelegate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKUIDelegate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-23  Anders Carlsson  <andersca@apple.com>
+
+        Put the WK_NULLABLE_SPECIFIER in the right place for block parameters
+        https://bugs.webkit.org/show_bug.cgi?id=142975
+        rdar://problem/19863930
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+        * UIProcess/API/Cocoa/WKUIDelegate.h:
+        * UIProcess/API/Cocoa/WKWebView.h:
+
 2015-03-23  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h

@@ -138 +138 @@
  @discussion If you do not implement this method, the web view will respond to the authentication challenge with the NSURLSessionAuthChallengeRejectProtectionSpace disposition.
  */
-- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, WK_NULLABLE_SPECIFIER NSURLCredential *credential))completionHandler;
+- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *WK_NULLABLE_SPECIFIER credential))completionHandler;
 
 @end

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h

@@ -106 +106 @@
  If you do not implement this method, the web view will behave as if the user selected the Cancel button.
  */
-- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(WK_NULLABLE NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(WK_NULLABLE_SPECIFIER NSString *result))completionHandler;
+- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(WK_NULLABLE NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * WK_NULLABLE_SPECIFIER result))completionHandler;
 
 @end

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

@@ -213 +213 @@
  @discussion The completionHandler is passed the result of the script evaluation or an error.
 */
-- (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^ WK_NULLABLE_SPECIFIER)(WK_NULLABLE_SPECIFIER id, WK_NULLABLE_SPECIFIER NSError *))completionHandler;
+- (void)evaluateJavaScript:(NSString *)javaScriptString completionHandler:(void (^ WK_NULLABLE_SPECIFIER)(WK_NULLABLE_SPECIFIER id, NSError * WK_NULLABLE_SPECIFIER error))completionHandler;
 
 /*! @abstract A Boolean value indicating whether horizontal swipe gestures