Changeset 195963 in webkit


Ignore:
Timestamp:
Feb 1, 2016 9:53:37 AM (8 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:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r195958 r195963  
     12016-02-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Get rid of WK_ macros for initializers
     4        https://bugs.webkit.org/show_bug.cgi?id=153744
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_DESIGNATED_INITIALIZER and
     9          WK_UNAVAILABLE.
     10
     11        * mac/postprocess-framework-headers.sh: Removed rules for rewriting the above macros. Also
     12          removed Foundation import that became unnecessary, and definitions that were only needed
     13          before iOS 8.
     14
     15        Replaced instances of the above macros with their expansions.
     16
     17        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
     18        * UIProcess/API/Cocoa/WKSecurityOrigin.h:
     19        * UIProcess/API/Cocoa/WKWebView.h:
     20        * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
     21
    1222016-02-01  Csaba Osztrogonác  <ossy@webkit.org>
    223

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

    r195922 r195963  
    6464#endif
    6565
    66 #ifndef __NSi_8_3
    67 #define __NSi_8_3 introduced=8.3
    68 #endif
    69 
    7066#ifdef __OBJC__
    71 #import <Foundation/Foundation.h>
    72 
    73 #ifdef NS_DESIGNATED_INITIALIZER
    74 #define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
    75 #else
    76 #define WK_DESIGNATED_INITIALIZER
    77 #endif
    78 
    79 #ifdef NS_UNAVAILABLE
    80 #define WK_UNAVAILABLE NS_UNAVAILABLE
    81 #else
    82 #define WK_UNAVAILABLE
    83 #endif
    84 
    8567#define WK_NULLABLE_SPECIFIER __nullable
    86 
    8768#endif
    8869

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

    r194646 r195963  
    3333
    3434@interface WKProcessPool ()
    35 - (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
     35- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) NS_DESIGNATED_INITIALIZER;
    3636@end
    3737

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

    r195922 r195963  
    4040@interface WKSecurityOrigin : NSObject
    4141
    42 - (instancetype)init WK_UNAVAILABLE;
     42- (instancetype)init NS_UNAVAILABLE;
    4343
    4444/*! @abstract The security origin's protocol.

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

    r195922 r195963  
    8282 on the web view.
    8383 */
    84 - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
    85 
    86 - (instancetype)initWithCoder:(NSCoder *)coder WK_UNAVAILABLE;
     84- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
     85
     86- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
    8787
    8888/*! @abstract Navigates to a requested URL.

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

    r195922 r195963  
    4848+ (WKWebsiteDataStore *)nonPersistentDataStore;
    4949
    50 - (instancetype)init WK_UNAVAILABLE;
     50- (instancetype)init NS_UNAVAILABLE;
    5151
    5252/*! @abstract Whether the data store is persistent or not. */

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

    r195922 r195963  
    6262        -e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
    6363        -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
    64         -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/
    6564        -e s/WK_NULLABLE_SPECIFIER/_Nullable/g
    66         -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/
    6765    )
    6866
Note: See TracChangeset for help on using the changeset viewer.