Title: [181859] trunk/Source/WebKit2
- Revision
- 181859
- Author
- [email protected]
- Date
- 2015-03-23 12:13:29 -0700 (Mon, 23 Mar 2015)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181858 => 181859)
--- trunk/Source/WebKit2/ChangeLog 2015-03-23 18:39:13 UTC (rev 181858)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-23 19:13:29 UTC (rev 181859)
@@ -1,3 +1,15 @@
+2015-03-23 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Add a share item to the link action menu
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (181858 => 181859)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2015-03-23 18:39:13 UTC (rev 181858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2015-03-23 19:13:29 UTC (rev 181859)
@@ -137,7 +137,7 @@
credential.
@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
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h (181858 => 181859)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2015-03-23 18:39:13 UTC (rev 181858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2015-03-23 19:13:29 UTC (rev 181859)
@@ -105,7 +105,7 @@
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
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (181858 => 181859)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2015-03-23 18:39:13 UTC (rev 181858)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2015-03-23 19:13:29 UTC (rev 181859)
@@ -212,7 +212,7 @@
@param completionHandler A block to invoke when script evaluation completes or fails.
@discussion The completionHandler is passed the result of the script evaluation or an error.
*/
-- (void)evaluateJavaScript:(NSString *)_javascript_String completionHandler:(void (^ WK_NULLABLE_SPECIFIER)(WK_NULLABLE_SPECIFIER id, WK_NULLABLE_SPECIFIER NSError *))completionHandler;
+- (void)evaluateJavaScript:(NSString *)_javascript_String completionHandler:(void (^ WK_NULLABLE_SPECIFIER)(WK_NULLABLE_SPECIFIER id, NSError * WK_NULLABLE_SPECIFIER error))completionHandler;
/*! @abstract A Boolean value indicating whether horizontal swipe gestures
will trigger back-forward list navigations.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
