Title: [195963] trunk/Source/WebKit2
- Revision
- 195963
- Author
- [email protected]
- Date
- 2016-02-01 09:53:37 -0800 (Mon, 01 Feb 2016)
Log Message
[Cocoa] Get rid of WK_ macros for initializers
https://bugs.webkit.org/show_bug.cgi?id=153744
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_DESIGNATED_INITIALIZER and
WK_UNAVAILABLE.
* mac/postprocess-framework-headers.sh: Removed rules for rewriting the above macros. Also
removed Foundation import that became unnecessary, and definitions that were only needed
before iOS 8.
Replaced instances of the above macros with their expansions.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
* UIProcess/API/Cocoa/WKSecurityOrigin.h:
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebsiteDataStore.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (195962 => 195963)
--- trunk/Source/WebKit2/ChangeLog 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-01 17:53:37 UTC (rev 195963)
@@ -1,3 +1,24 @@
+2016-02-01 Dan Bernstein <[email protected]>
+
+ [Cocoa] Get rid of WK_ macros for initializers
+ https://bugs.webkit.org/show_bug.cgi?id=153744
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_DESIGNATED_INITIALIZER and
+ WK_UNAVAILABLE.
+
+ * mac/postprocess-framework-headers.sh: Removed rules for rewriting the above macros. Also
+ removed Foundation import that became unnecessary, and definitions that were only needed
+ before iOS 8.
+
+ Replaced instances of the above macros with their expansions.
+
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+ * UIProcess/API/Cocoa/WKSecurityOrigin.h:
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
+
2016-02-01 Csaba Osztrogonác <[email protected]>
One more unreviewed speculative buildfix after r195755.
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (195962 => 195963)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-02-01 17:53:37 UTC (rev 195963)
@@ -63,27 +63,8 @@
#endif
-#ifndef __NSi_8_3
-#define __NSi_8_3 introduced=8.3
-#endif
-
#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-
-#ifdef NS_DESIGNATED_INITIALIZER
-#define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
-#else
-#define WK_DESIGNATED_INITIALIZER
-#endif
-
-#ifdef NS_UNAVAILABLE
-#define WK_UNAVAILABLE NS_UNAVAILABLE
-#else
-#define WK_UNAVAILABLE
-#endif
-
#define WK_NULLABLE_SPECIFIER __nullable
-
#endif
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (195962 => 195963)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2016-02-01 17:53:37 UTC (rev 195963)
@@ -32,7 +32,7 @@
@protocol _WKDownloadDelegate;
@interface WKProcessPool ()
-- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
+- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) NS_DESIGNATED_INITIALIZER;
@end
@interface WKProcessPool (WKPrivate)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h (195962 => 195963)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h 2016-02-01 17:53:37 UTC (rev 195963)
@@ -39,7 +39,7 @@
WK_CLASS_AVAILABLE(10_11, 9_0)
@interface WKSecurityOrigin : NSObject
-- (instancetype)init WK_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
/*! @abstract The security origin's protocol.
*/
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (195962 => 195963)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-02-01 17:53:37 UTC (rev 195963)
@@ -81,9 +81,9 @@
mutating the configuration after invoking the initializer has no effect
on the web view.
*/
-- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
+- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
-- (instancetype)initWithCoder:(NSCoder *)coder WK_UNAVAILABLE;
+- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
/*! @abstract Navigates to a requested URL.
@param request The request specifying the URL to which to navigate.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (195962 => 195963)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-02-01 17:53:37 UTC (rev 195963)
@@ -47,7 +47,7 @@
*/
+ (WKWebsiteDataStore *)nonPersistentDataStore;
-- (instancetype)init WK_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
/*! @abstract Whether the data store is persistent or not. */
@property (nonatomic, readonly, getter=isPersistent) BOOL persistent;
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (195962 => 195963)
--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-02-01 17:53:37 UTC (rev 195963)
@@ -61,9 +61,7 @@
-e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g'
-e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
-e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
- -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/
-e s/WK_NULLABLE_SPECIFIER/_Nullable/g
- -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/
)
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
