Title: [202746] trunk/Source/WebKit2
- Revision
- 202746
- Author
- [email protected]
- Date
- 2016-07-01 12:07:20 -0700 (Fri, 01 Jul 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (202745 => 202746)
--- trunk/Source/WebKit2/ChangeLog 2016-07-01 18:36:26 UTC (rev 202745)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-01 19:07:20 UTC (rev 202746)
@@ -1,3 +1,16 @@
+2016-07-01 Dan Bernstein <[email protected]>
+
+ [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:
+
2016-07-01 Youenn Fablet <[email protected]>
Add a runtime flag for DOM iterators
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (202745 => 202746)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-07-01 18:36:26 UTC (rev 202745)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-07-01 19:07:20 UTC (rev 202746)
@@ -64,9 +64,5 @@
#endif
-#ifdef __OBJC__
-#define WK_NULLABLE_SPECIFIER __nullable
#endif
-#endif
-
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (202745 => 202746)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2016-07-01 18:36:26 UTC (rev 202745)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2016-07-01 19:07:20 UTC (rev 202746)
@@ -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, NSURLCredential *WK_NULLABLE_SPECIFIER credential))completionHandler;
+- (void)webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler;
/*! @abstract Invoked when the web view's web content process is terminated.
@param webView The web view whose underlying web content process was terminated.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h (202745 => 202746)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2016-07-01 18:36:26 UTC (rev 202745)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2016-07-01 19:07:20 UTC (rev 202746)
@@ -115,7 +115,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:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * WK_NULLABLE_SPECIFIER result))completionHandler;
+- (void)webView:(WKWebView *)webView runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(nullable NSString *)defaultText initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSString * _Nullable result))completionHandler;
#if TARGET_OS_IPHONE
@@ -164,7 +164,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 runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(WK_ARRAY(NSURL *) * WK_NULLABLE_SPECIFIER URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
+- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(WK_ARRAY(NSURL *) * _Nullable URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (202745 => 202746)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-07-01 18:36:26 UTC (rev 202745)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-07-01 19:07:20 UTC (rev 202746)
@@ -218,7 +218,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, NSError * WK_NULLABLE_SPECIFIER error))completionHandler;
+- (void)evaluateJavaScript:(NSString *)_javascript_String completionHandler:(void (^ _Nullable)(_Nullable id, NSError * _Nullable error))completionHandler;
/*! @abstract A Boolean value indicating whether horizontal swipe gestures
will trigger back-forward list navigations.
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (202745 => 202746)
--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-07-01 18:36:26 UTC (rev 202745)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-07-01 19:07:20 UTC (rev 202746)
@@ -61,7 +61,6 @@
-e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g'
-e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
-e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
- -e s/WK_NULLABLE_SPECIFIER/_Nullable/g
)
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
