[webkit-changes] [291720] branches/safari-614.1.6-branch/Source/WebKit

Tue, 22 Mar 2022 16:20:32 -0700

Title: [291720] branches/safari-614.1.6-branch/Source/WebKit
Revision
291720
Author
[email protected]
Date
2022-03-22 16:19:32 -0700 (Tue, 22 Mar 2022)

Log Message

Cherry-pick r291691. rdar://problem/90654598

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

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-614.1.6-branch/Source/WebKit/ChangeLog (291719 => 291720)


--- branches/safari-614.1.6-branch/Source/WebKit/ChangeLog	2022-03-22 23:13:11 UTC (rev 291719)
+++ branches/safari-614.1.6-branch/Source/WebKit/ChangeLog	2022-03-22 23:19:32 UTC (rev 291720)
@@ -1,3 +1,39 @@
+2022-03-22  Russell Epstein  <[email protected]>
+
+        Cherry-pick r291691. rdar://problem/90654598
+
+    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).
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291691 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2022-03-22  Tim Horton  <[email protected]>
+
+            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-18  Russell Epstein  <[email protected]>
 
         Cherry-pick r291437. rdar://problem/90445115

Modified: branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h (291719 => 291720)


--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h	2022-03-22 23:13:11 UTC (rev 291719)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextPolicyDelegate.h	2022-03-22 23:19:32 UTC (rev 291720)
@@ -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: branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h (291719 => 291720)


--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h	2022-03-22 23:13:11 UTC (rev 291719)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h	2022-03-22 23:19:32 UTC (rev 291720)
@@ -26,37 +26,36 @@
 #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));

Modified: branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h (291719 => 291720)


--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h	2022-03-22 23:13:11 UTC (rev 291719)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.h	2022-03-22 23:19:32 UTC (rev 291720)
@@ -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: branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h (291719 => 291720)


--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h	2022-03-22 23:13:11 UTC (rev 291719)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.h	2022-03-22 23:19:32 UTC (rev 291720)
@@ -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: branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h (291719 => 291720)


--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h	2022-03-22 23:13:11 UTC (rev 291719)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h	2022-03-22 23:19:32 UTC (rev 291720)
@@ -28,7 +28,6 @@
 #endif
 
 #import <Foundation/Foundation.h>
-#import <WebKit/WKDeclarationSpecifiers.h>
 #import <WebKit/WKFoundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -90,15 +89,15 @@
     _WKWebAuthenticationUserVerificationAvailabilityNotSupported,
 } 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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to