⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 291691 in webkit


Ignore:
Timestamp:
Mar 22, 2022, 1:03:45 PM (5 years ago)
Author:
timothy_horton@apple.com
Message:

Prefer WK_EXTERN to WK_EXPORT in Cocoa API headers
​https://bugs.webkit.org/show_bug.cgi?id=238129

Reviewed by Wenson Hsieh.

  • UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h:
  • UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
  • UIProcess/API/Cocoa/_WKElementAction.h:
  • UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h:
  • UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h:

WK_EXPORT comes from WKDeclarationSpecifiers.h, which is a legacy C SPI header.
WK_EXTERN comes from WKFoundation.h, part of the modern public API.
We should prefer the modern version in Cocoa-only headers (even in private headers).

Location:
trunk/Source/WebKit
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r291689 r291691  
     12022-03-22  Tim Horton  <timothy_horton@apple.com>
     2
     3        Prefer WK_EXTERN to WK_EXPORT in Cocoa API headers
     4        https://bugs.webkit.org/show_bug.cgi?id=238129
     5
     6        Reviewed by Wenson Hsieh.
     7
     8        * UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h:
     9        * UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h:
     10        * UIProcess/API/Cocoa/_WKElementAction.h:
     11        * UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h:
     12        * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h:
     13        WK_EXPORT comes from WKDeclarationSpecifiers.h, which is a legacy C SPI header.
     14        WK_EXTERN comes from WKFoundation.h, part of the modern public API.
     15        We should prefer the modern version in Cocoa-only headers (even in private headers).
     16
    1172022-03-22  Chris Dumez  <cdumez@apple.com>
    218

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h

    r245294 r291691  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit/WKDeclarationSpecifiers.h>
    2827
    2928@class WKBrowsingContextController;
    3029
    3130/* Constants for policy action dictionaries */
    32 WK_EXPORT extern NSString * const WKActionIsMainFrameKey;         // NSNumber (BOOL)
    33 WK_EXPORT extern NSString * const WKActionMouseButtonKey;         // NSNumber (0 for left button, 1 for middle button, 2 for right button)
    34 WK_EXPORT extern NSString * const WKActionModifierFlagsKey;       // NSNumber (unsigned)
    35 WK_EXPORT extern NSString * const WKActionOriginalURLRequestKey;  // NSURLRequest
    36 WK_EXPORT extern NSString * const WKActionURLRequestKey;          // NSURLRequest
    37 WK_EXPORT extern NSString * const WKActionURLResponseKey;         // NSURLResponse
    38 WK_EXPORT extern NSString * const WKActionFrameNameKey;           // NSString
    39 WK_EXPORT extern NSString * const WKActionOriginatingFrameURLKey; // NSURL
    40 WK_EXPORT extern NSString * const WKActionCanShowMIMETypeKey;     // NSNumber (BOOL)
     31WK_EXTERN NSString * const WKActionIsMainFrameKey;         // NSNumber (BOOL)
     32WK_EXTERN NSString * const WKActionMouseButtonKey;         // NSNumber (0 for left button, 1 for middle button, 2 for right button)
     33WK_EXTERN NSString * const WKActionModifierFlagsKey;       // NSNumber (unsigned)
     34WK_EXTERN NSString * const WKActionOriginalURLRequestKey;  // NSURLRequest
     35WK_EXTERN NSString * const WKActionURLRequestKey;          // NSURLRequest
     36WK_EXTERN NSString * const WKActionURLResponseKey;         // NSURLResponse
     37WK_EXTERN NSString * const WKActionFrameNameKey;           // NSString
     38WK_EXTERN NSString * const WKActionOriginatingFrameURLKey; // NSURL
     39WK_EXTERN NSString * const WKActionCanShowMIMETypeKey;     // NSNumber (BOOL)
    4140
    4241typedef NS_ENUM(NSUInteger, WKPolicyDecision) {

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h

    r291253 r291691  
    2727
    2828#import <Foundation/Foundation.h>
    29 #import <WebKit/WKDeclarationSpecifiers.h>
    3029
    31 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macos(10.12), ios(10.0));
    32 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
    33 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
    34 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyMediaLink WK_API_AVAILABLE(macos(10.14), ios(12.0));
    35 WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
    36 WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macos(10.12), ios(10.0));
    37 WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadMedia WK_API_AVAILABLE(macos(10.14), ios(12.0));
    38 WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoBack WK_API_AVAILABLE(macos(10.12), ios(10.0));
    39 WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoForward WK_API_AVAILABLE(macos(10.12), ios(10.0));
    40 WK_EXPORT extern NSString * const _WKMenuItemIdentifierInspectElement WK_API_AVAILABLE(macos(10.12), ios(10.0));
    41 WK_EXPORT extern NSString * const _WKMenuItemIdentifierLookUp WK_API_AVAILABLE(macos(10.12), ios(10.0));
    42 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
    43 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
    44 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
    45 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
    46 WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenMediaInNewWindow WK_API_AVAILABLE(macos(10.14), ios(12.0));
    47 WK_EXPORT extern NSString * const _WKMenuItemIdentifierPaste WK_API_AVAILABLE(macos(10.12), ios(10.0));
    48 WK_EXPORT extern NSString * const _WKMenuItemIdentifierReload WK_API_AVAILABLE(macos(10.12), ios(10.0));
    49 WK_EXPORT extern NSString * const _WKMenuItemIdentifierRevealImage WK_API_AVAILABLE(macos(12.0), ios(15.0));
    50 WK_EXPORT extern NSString * const _WKMenuItemIdentifierSearchWeb WK_API_AVAILABLE(macos(10.12), ios(10.0));
    51 WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_API_AVAILABLE(macos(10.12), ios(10.0));
    52 WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleEnhancedFullScreen WK_API_AVAILABLE(macos(10.14), ios(12.0));
    53 WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleFullScreen WK_API_AVAILABLE(macos(10.12), ios(10.0));
     30WK_EXTERN NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macos(10.12), ios(10.0));
     31WK_EXTERN NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
     32WK_EXTERN NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
     33WK_EXTERN NSString * const _WKMenuItemIdentifierCopyMediaLink WK_API_AVAILABLE(macos(10.14), ios(12.0));
     34WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
     35WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macos(10.12), ios(10.0));
     36WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadMedia WK_API_AVAILABLE(macos(10.14), ios(12.0));
     37WK_EXTERN NSString * const _WKMenuItemIdentifierGoBack WK_API_AVAILABLE(macos(10.12), ios(10.0));
     38WK_EXTERN NSString * const _WKMenuItemIdentifierGoForward WK_API_AVAILABLE(macos(10.12), ios(10.0));
     39WK_EXTERN NSString * const _WKMenuItemIdentifierInspectElement WK_API_AVAILABLE(macos(10.12), ios(10.0));
     40WK_EXTERN NSString * const _WKMenuItemIdentifierLookUp WK_API_AVAILABLE(macos(10.12), ios(10.0));
     41WK_EXTERN NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
     42WK_EXTERN NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
     43WK_EXTERN NSString * const _WKMenuItemIdentifierOpenLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
     44WK_EXTERN NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
     45WK_EXTERN NSString * const _WKMenuItemIdentifierOpenMediaInNewWindow WK_API_AVAILABLE(macos(10.14), ios(12.0));
     46WK_EXTERN NSString * const _WKMenuItemIdentifierPaste WK_API_AVAILABLE(macos(10.12), ios(10.0));
     47WK_EXTERN NSString * const _WKMenuItemIdentifierReload WK_API_AVAILABLE(macos(10.12), ios(10.0));
     48WK_EXTERN NSString * const _WKMenuItemIdentifierRevealImage WK_API_AVAILABLE(macos(12.0), ios(15.0));
     49WK_EXTERN NSString * const _WKMenuItemIdentifierSearchWeb WK_API_AVAILABLE(macos(10.12), ios(10.0));
     50WK_EXTERN NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_API_AVAILABLE(macos(10.12), ios(10.0));
     51WK_EXTERN NSString * const _WKMenuItemIdentifierToggleEnhancedFullScreen WK_API_AVAILABLE(macos(10.14), ios(12.0));
     52WK_EXTERN NSString * const _WKMenuItemIdentifierToggleFullScreen WK_API_AVAILABLE(macos(10.12), ios(10.0));
    5453
    55 WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
    56 WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpeechMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
     54WK_EXTERN NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
     55WK_EXTERN NSString * const _WKMenuItemIdentifierSpeechMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
    5756
    58 WK_EXPORT extern NSString * const _WKMenuItemIdentifierAddHighlightToCurrentQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
    59 WK_EXPORT extern NSString * const _WKMenuItemIdentifierAddHighlightToNewQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
     57WK_EXTERN NSString * const _WKMenuItemIdentifierAddHighlightToCurrentQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
     58WK_EXTERN NSString * const _WKMenuItemIdentifierAddHighlightToNewQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
    6059
    61 WK_EXPORT extern NSString * const _WKMenuItemIdentifierTranslate WK_API_AVAILABLE(macos(12.0), ios(15.0));
    62 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyCroppedImage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     60WK_EXTERN NSString * const _WKMenuItemIdentifierTranslate WK_API_AVAILABLE(macos(12.0), ios(15.0));
     61WK_EXTERN NSString * const _WKMenuItemIdentifierCopyCroppedImage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    6362
    64 WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpellingMenu WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    65 WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowSpellingPanel WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    66 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCheckSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    67 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCheckSpellingWhileTyping WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    68 WK_EXPORT extern NSString * const _WKMenuItemIdentifierCheckGrammarWithSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     63WK_EXTERN NSString * const _WKMenuItemIdentifierSpellingMenu WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     64WK_EXTERN NSString * const _WKMenuItemIdentifierShowSpellingPanel WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     65WK_EXTERN NSString * const _WKMenuItemIdentifierCheckSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     66WK_EXTERN NSString * const _WKMenuItemIdentifierCheckSpellingWhileTyping WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     67WK_EXTERN NSString * const _WKMenuItemIdentifierCheckGrammarWithSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h

    r289681 r291691  
    2828#if TARGET_OS_IPHONE
    2929
    30 #import <WebKit/WKBase.h>
    3130#import <WebKit/_WKActivatedElementInfo.h>
    3231
    … …  
    3534
    3635typedef NSString *UIActionIdentifier;
    37 WK_EXPORT extern UIActionIdentifier const WKElementActionTypeToggleShowLinkPreviewsIdentifier;
     36WK_EXTERN UIActionIdentifier const WKElementActionTypeToggleShowLinkPreviewsIdentifier;
    3837
    3938typedef void (^WKElementActionHandler)(_WKActivatedElementInfo *);

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h

    r242339 r291691  
    2727
    2828#import <Foundation/Foundation.h>
    29 #import <WebKit/WKDeclarationSpecifiers.h>
    3029
    31 WK_EXPORT extern NSString * const _WKRecoveryAttempterErrorKey;
     30WK_EXTERN NSString * const _WKRecoveryAttempterErrorKey;
    3231
    3332@protocol _WKErrorRecoveryAttempting <NSObject>

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h

    r291625 r291691  
    2525
    2626#import <Foundation/Foundation.h>
    27 #import <WebKit/WKDeclarationSpecifiers.h>
    2827#import <WebKit/WKFoundation.h>
    2928
    … …  
    9493} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    9594
    96 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialNameKey;
    97 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialDisplayNameKey;
    98 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialIDKey;
    99 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialRelyingPartyIDKey;
    100 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialLastModificationDateKey;
    101 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialCreationDateKey;
    102 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialGroupKey;
    103 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialSynchronizableKey;
    104 WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialUserHandleKey;
     95WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialNameKey;
     96WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialDisplayNameKey;
     97WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialIDKey;
     98WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialRelyingPartyIDKey;
     99WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialLastModificationDateKey;
     100WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialCreationDateKey;
     101WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialGroupKey;
     102WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialSynchronizableKey;
     103WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialUserHandleKey;
    105104
    106105@protocol _WKWebAuthenticationPanelDelegate <NSObject>
Note: See TracChangeset for help on using the changeset viewer.