[webkit-changes] [291691] trunk/Source/WebKit

Tue, 22 Mar 2022 13:04:38 -0700

Title: [291691] trunk/Source/WebKit
Revision
291691
Author
timothy_hor...@apple.com
Date
2022-03-22 13:03:45 -0700 (Tue, 22 Mar 2022)

Log 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).

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (291690 => 291691)


--- trunk/Source/WebKit/ChangeLog	2022-03-22 19:54:50 UTC (rev 291690)
+++ trunk/Source/WebKit/ChangeLog	2022-03-22 20:03:45 UTC (rev 291691)
@@ -1,3 +1,19 @@
+2022-03-22  Tim Horton  <timothy_hor...@apple.com>
+
+        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).
+
 2022-03-22  Chris Dumez  <cdu...@apple.com>
 
         REGRESSION (iOS 15.1 / r280824) QuickLook - model not loading when passing extra parameters

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h (291690 => 291691)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h	2022-03-22 19:54:50 UTC (rev 291690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h	2022-03-22 20:03:45 UTC (rev 291691)
@@ -24,20 +24,19 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WKDeclarationSpecifiers.h>
 
 @class WKBrowsingContextController;
 
 /* Constants for policy action dictionaries */
-WK_EXPORT extern NSString * const WKActionIsMainFrameKey;         // NSNumber (BOOL)
-WK_EXPORT extern NSString * const WKActionMouseButtonKey;         // NSNumber (0 for left button, 1 for middle button, 2 for right button)
-WK_EXPORT extern NSString * const WKActionModifierFlagsKey;       // NSNumber (unsigned)
-WK_EXPORT extern NSString * const WKActionOriginalURLRequestKey;  // NSURLRequest
-WK_EXPORT extern NSString * const WKActionURLRequestKey;          // NSURLRequest
-WK_EXPORT extern NSString * const WKActionURLResponseKey;         // NSURLResponse
-WK_EXPORT extern NSString * const WKActionFrameNameKey;           // NSString
-WK_EXPORT extern NSString * const WKActionOriginatingFrameURLKey; // NSURL
-WK_EXPORT extern NSString * const WKActionCanShowMIMETypeKey;     // NSNumber (BOOL)
+WK_EXTERN NSString * const WKActionIsMainFrameKey;         // NSNumber (BOOL)
+WK_EXTERN NSString * const WKActionMouseButtonKey;         // NSNumber (0 for left button, 1 for middle button, 2 for right button)
+WK_EXTERN NSString * const WKActionModifierFlagsKey;       // NSNumber (unsigned)
+WK_EXTERN NSString * const WKActionOriginalURLRequestKey;  // NSURLRequest
+WK_EXTERN NSString * const WKActionURLRequestKey;          // NSURLRequest
+WK_EXTERN NSString * const WKActionURLResponseKey;         // NSURLResponse
+WK_EXTERN NSString * const WKActionFrameNameKey;           // NSString
+WK_EXTERN NSString * const WKActionOriginatingFrameURLKey; // NSURL
+WK_EXTERN NSString * const WKActionCanShowMIMETypeKey;     // NSNumber (BOOL)
 
 typedef NS_ENUM(NSUInteger, WKPolicyDecision) {
     WKPolicyDecisionCancel,

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h (291690 => 291691)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h	2022-03-22 19:54:50 UTC (rev 291690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h	2022-03-22 20:03:45 UTC (rev 291691)
@@ -26,43 +26,42 @@
 #import <WebKit/WKFoundation.h>
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WKDeclarationSpecifiers.h>
 
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyMediaLink WK_API_AVAILABLE(macos(10.14), ios(12.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierDownloadMedia WK_API_AVAILABLE(macos(10.14), ios(12.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoBack WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierGoForward WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierInspectElement WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierLookUp WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierOpenMediaInNewWindow WK_API_AVAILABLE(macos(10.14), ios(12.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierPaste WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierReload WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierRevealImage WK_API_AVAILABLE(macos(12.0), ios(15.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierSearchWeb WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleEnhancedFullScreen WK_API_AVAILABLE(macos(10.14), ios(12.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierToggleFullScreen WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCopyMediaLink WK_API_AVAILABLE(macos(10.14), ios(12.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadMedia WK_API_AVAILABLE(macos(10.14), ios(12.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierGoBack WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierGoForward WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierInspectElement WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierLookUp WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierOpenFrameInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierOpenImageInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierOpenLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierOpenLinkInNewWindow WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierOpenMediaInNewWindow WK_API_AVAILABLE(macos(10.14), ios(12.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierPaste WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierReload WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierRevealImage WK_API_AVAILABLE(macos(12.0), ios(15.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierSearchWeb WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierShowHideMediaControls WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierToggleEnhancedFullScreen WK_API_AVAILABLE(macos(10.14), ios(12.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierToggleFullScreen WK_API_AVAILABLE(macos(10.12), ios(10.0));
 
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpeechMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierShareMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierSpeechMenu WK_API_AVAILABLE(macos(10.12), ios(10.0));
 
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierAddHighlightToCurrentQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierAddHighlightToNewQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierAddHighlightToCurrentQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierAddHighlightToNewQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
 
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierTranslate WK_API_AVAILABLE(macos(12.0), ios(15.0));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCopyCroppedImage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+WK_EXTERN NSString * const _WKMenuItemIdentifierTranslate WK_API_AVAILABLE(macos(12.0), ios(15.0));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCopyCroppedImage WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierSpellingMenu WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierShowSpellingPanel WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCheckSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCheckSpellingWhileTyping WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-WK_EXPORT extern NSString * const _WKMenuItemIdentifierCheckGrammarWithSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+WK_EXTERN NSString * const _WKMenuItemIdentifierSpellingMenu WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+WK_EXTERN NSString * const _WKMenuItemIdentifierShowSpellingPanel WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCheckSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCheckSpellingWhileTyping WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+WK_EXTERN NSString * const _WKMenuItemIdentifierCheckGrammarWithSpelling WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h (291690 => 291691)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h	2022-03-22 19:54:50 UTC (rev 291690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h	2022-03-22 20:03:45 UTC (rev 291691)
@@ -27,7 +27,6 @@
 
 #if TARGET_OS_IPHONE
 
-#import <WebKit/WKBase.h>
 #import <WebKit/_WKActivatedElementInfo.h>
 
 @class UIAction;
@@ -34,7 +33,7 @@
 @class UIImage;
 
 typedef NSString *UIActionIdentifier;
-WK_EXPORT extern UIActionIdentifier const WKElementActionTypeToggleShowLinkPreviewsIdentifier;
+WK_EXTERN UIActionIdentifier const WKElementActionTypeToggleShowLinkPreviewsIdentifier;
 
 typedef void (^WKElementActionHandler)(_WKActivatedElementInfo *);
 typedef BOOL (^WKElementActionDismissalHandler)(void);

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h (291690 => 291691)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h	2022-03-22 19:54:50 UTC (rev 291690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h	2022-03-22 20:03:45 UTC (rev 291691)
@@ -26,9 +26,8 @@
 #import <WebKit/WKFoundation.h>
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WKDeclarationSpecifiers.h>
 
-WK_EXPORT extern NSString * const _WKRecoveryAttempterErrorKey;
+WK_EXTERN NSString * const _WKRecoveryAttempterErrorKey;
 
 @protocol _WKErrorRecoveryAttempting <NSObject>

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h (291690 => 291691)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h	2022-03-22 19:54:50 UTC (rev 291690)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h	2022-03-22 20:03:45 UTC (rev 291691)
@@ -24,7 +24,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WKDeclarationSpecifiers.h>
 #import <WebKit/WKFoundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -93,15 +92,15 @@
     _WKWebAuthenticationMediationRequirementConditional,
 } WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialNameKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialDisplayNameKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialIDKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialRelyingPartyIDKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialLastModificationDateKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialCreationDateKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialGroupKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialSynchronizableKey;
-WK_EXPORT extern NSString * const _WKLocalAuthenticatorCredentialUserHandleKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialNameKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialDisplayNameKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialIDKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialRelyingPartyIDKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialLastModificationDateKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialCreationDateKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialGroupKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialSynchronizableKey;
+WK_EXTERN NSString * const _WKLocalAuthenticatorCredentialUserHandleKey;
 
 @protocol _WKWebAuthenticationPanelDelegate <NSObject>
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to