Changeset 195963 in webkit

Timestamp:

Feb 1, 2016, 9:53:37 AM (9 years ago)

Author:

mitz@apple.com

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKFoundation.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKProcessPoolPrivate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKSecurityOrigin.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.h (modified) (1 diff)
• mac/postprocess-framework-headers.sh (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog ¶

@@ +1 @@
+2016-02-01  Dan Bernstein  <mitz@apple.com>
+
+        [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  <ossy@webkit.org>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h ¶

@@ -64 +64 @@
 #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
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h ¶

@@ -33 +33 @@
 
 @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
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h ¶

@@ -40 +40 @@
 @interface WKSecurityOrigin : NSObject
 
-- (instancetype)init WK_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
 
 /*! @abstract The security origin's protocol.

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

@@ -82 +82 @@
  on the web view.
  */
-- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
-
-- (instancetype)initWithCoder:(NSCoder *)coder WK_UNAVAILABLE;
+- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
 
 /*! @abstract Navigates to a requested URL.

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h ¶

@@ -48 +48 @@
 + (WKWebsiteDataStore *)nonPersistentDataStore;
 
-- (instancetype)init WK_UNAVAILABLE;
+- (instancetype)init NS_UNAVAILABLE;
 
 /*! @abstract Whether the data store is persistent or not. */

trunk/Source/WebKit2/mac/postprocess-framework-headers.sh ¶

@@ -62 +62 @@
         -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/
     )