Changeset 169356 in webkit

Timestamp:

May 26, 2014 11:00:47 AM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Rewrite WK_DESIGNATED_INITIALIZER in installed headers
​https://bugs.webkit.org/show_bug.cgi?id=133290

Reviewed by Anders Carlsson.

• Shared/API/Cocoa/WKFoundation.h: When WK_API_AVAILABILITY_ENABLED is defined, don’t

provide definitions of WK_DESIGNATED_INITIALIZER and WK_UNAVAILABLE, since those macros will
be rewritten out of the headers. When WK_API_AVAILABILITY_ENABLED isn’t defined, provide
definitions of the other two macros as appropriate for the target OS.

• UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Removed WK_DESIGNATED_INITIALIZER from a

category method declaration.

• UIProcess/API/Cocoa/WKWebView.h: Mark the superclass designated initializer

-initWithCoder: as unavailable.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithCoder:]): Override this designated initializer of the superclass by
returning nil.

• mac/rewrite-availability-macros.sh: Rewrite WK_DESIGNATED_INITIALIZER to

NS_DESIGNATED_INITIALIZER and WK_UNAVAILABLE to NS_UNAVAILABLE. Also make sure to process
all headers if the script has changed since the last time it was run.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKFoundation.h (modified) (2 diffs)
• UIProcess/API/Cocoa/WKProcessPoolPrivate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• mac/rewrite-availability-macros.sh (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-26  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Rewrite WK_DESIGNATED_INITIALIZER in installed headers
+        https://bugs.webkit.org/show_bug.cgi?id=133290
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/API/Cocoa/WKFoundation.h: When WK_API_AVAILABILITY_ENABLED is defined, don’t
+        provide definitions of WK_DESIGNATED_INITIALIZER and WK_UNAVAILABLE, since those macros will
+        be rewritten out of the headers. When WK_API_AVAILABILITY_ENABLED isn’t defined, provide
+        definitions of the other two macros as appropriate for the target OS.
+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Removed WK_DESIGNATED_INITIALIZER from a
+        category method declaration.
+        * UIProcess/API/Cocoa/WKWebView.h: Mark the superclass designated initializer
+        -initWithCoder: as unavailable.
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView initWithCoder:]): Override this designated initializer of the superclass by
+        returning nil.
+        * mac/rewrite-availability-macros.sh: Rewrite WK_DESIGNATED_INITIALIZER to
+        NS_DESIGNATED_INITIALIZER and WK_UNAVAILABLE to NS_UNAVAILABLE. Also make sure to process
+        all headers if the script has changed since the last time it was run.
+
 2014-05-26  Commit Queue  <commit-queue@webkit.org>
 

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

@@ -48 +48 @@
 #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
 
+#define WK_DESIGNATED_INITIALIZER
+#define WK_UNAVAILABLE
+
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
@@ -53 +56 @@
 #endif
 
+#else
+
+#define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
+#define WK_UNAVAILABLE NS_UNAVAILABLE
+
 #endif
 
 #endif
-
-#define WK_DESIGNATED_INITIALIZER

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

@@ -33 +33 @@
 @interface WKProcessPool (WKPrivate)
 
-- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
+- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init)));
 
 @property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;

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

@@ -80 +80 @@
 - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
 
+- (instancetype)initWithCoder:(NSCoder *)coder WK_UNAVAILABLE;
+
 /*! @abstract Navigates to the given NSURLRequest.
  @param request The NSURLRequest to navigate to.

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

@@ -269 +269 @@
 }
 
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+    [self release];
+    return nil;
+}
+
 - (void)dealloc
 {

trunk/Source/WebKit2/mac/rewrite-availability-macros.sh

@@ -31 +31 @@
 TIMESTAMP_PATH=${TARGET_TEMP_DIR}/${0##*/}
 
+if [[ $0 -nt $TIMESTAMP_PATH ]]; then
+    rm "${TIMESTAMP_PATH}";
+fi
+
 function rewrite_headers () {
     for HEADER_PATH in $1/*.h; do
         if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
-            sed -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
+            sed -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
             mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH;
         fi