Skip to content

Commit f4a9c6f

Browse files
emw-appleemw-apple
committed
[visionOS] API availability annotations missing in SDK
rdar://127512928 https://bugs.webkit.org/show_bug.cgi?id=273718 Reviewed by Tim Horton. Add WK_XROS_TBA and JSC_XROS_TBA macro tokens, to be substituted with upcoming version numbers in internal builds, like their equivalents in other platforms. Going forward, new API and SPI should have a visionOS availability version. The visionOS SDK will continue to recognize iOS availability versions and map them to visionOS version numbers, so existing declarations that shipped in visionOS 1.0 are intentionally left unchanged. There are no active TBA'd interfaces in JavaScriptCore, so the only declaration changes are in WebKit. Fixes a semi-related regression, where no availability declarations were being emitted in visionOS builds, because scripts were using PLATFORM_NAME instead of WK_PLATFORM_NAME to check eligibility. * Source/JavaScriptCore/Scripts/postprocess-header-rule: * Source/WebKit/Scripts/postprocess-header-rule: * Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.h: * Source/WebKit/Shared/API/Cocoa/_WKHitTestResult.h: * Source/WebKit/UIProcess/API/Cocoa/NSAttributedStringPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKBackForwardListItem.h: * Source/WebKit/UIProcess/API/Cocoa/WKFrameInfoPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h: * Source/WebKit/UIProcess/API/Cocoa/_WKApplicationManifest.h: * Source/WebKit/UIProcess/API/Cocoa/_WKArchiveConfiguration.h: * Source/WebKit/UIProcess/API/Cocoa/_WKArchiveExclusionRule.h: * Source/WebKit/UIProcess/API/Cocoa/_WKAttachment.h: * Source/WebKit/UIProcess/API/Cocoa/_WKRectEdge.h: * Source/WebKit/UIProcess/API/Cocoa/_WKTargetedElementInfo.h: * Source/WebKit/UIProcess/API/Cocoa/_WKTargetedElementRequest.h: * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionAction.h: * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionCommand.h: * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionDataRecord.h: (NS_ERROR_ENUM): * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionDataType.h: * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionMessagePort.h: (NS_ERROR_ENUM): * Source/WebKit/UIProcess/API/Cocoa/_WKWebExtensionPermissionPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h: * Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreDelegate.h: * Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Canonical link: https://commits.webkit.org/278485@main
1 parent 7534227 commit f4a9c6f

32 files changed

+122
-101
lines changed

‎Source/JavaScriptCore/Scripts/postprocess-header-rule

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ if [[ "${JSC_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
5353
if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
5454
[[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
5555
[[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER=${TARGET_MAC_OS_X_VERSION_MAJOR}
56+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
57+
[[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
5658

5759
if [[ "${WK_PLATFORM_NAME}" == "maccatalyst" && "${LLVM_TARGET_TRIPLE_OS_VERSION}" == ios* ]]; then
5860
# On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
@@ -63,21 +65,33 @@ if [[ "${JSC_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
6365
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
6466
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0"
6567
fi
68+
[[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
6669
elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
6770
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}
71+
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${SDK_VERSION_MAJOR}
6872
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
6973
[[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER="0"
70-
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER=${SDK_VERSION_MAJOR}
74+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
75+
[[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER="0"
76+
elif [[ "${PLATFORM_NAME}" == xr* ]]; then
77+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION=${XROS_DEPLOYMENT_TARGET}
78+
[[ -n ${XROS_VERSION_NUMBER} ]] || XROS_VERSION_NUMBER=${SDK_VERSION_MAJOR}
79+
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
80+
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
81+
[[ -n ${OSX_VERSION_NUMBER} ]] || OSX_VERSION_NUMBER="0"
82+
[[ -n ${IOS_VERSION_NUMBER} ]] || IOS_VERSION_NUMBER="0"
7183
fi
7284

7385
SED_OPTIONS=()
7486

75-
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
87+
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" && -n "$XROS_VERSION" ]]; then
7688
SED_OPTIONS+=(
7789
-e s/JSC_MAC_TBA/${OSX_VERSION}/g
7890
-e s/JSC_IOS_TBA/${IOS_VERSION}/g
91+
-e s/JSC_XROS_TBA/${XROS_VESRION}/g
7992
-e s/JSC_MAC_VERSION_TBA/${OSX_VERSION_NUMBER}/g
8093
-e s/JSC_IOS_VERSION_TBA/${IOS_VERSION_NUMBER}/g
94+
-e s/JSC_XROS_VERSION_TBA/${XROS_VERSION_NUMBER}/g
8195
-e s/JSC_API_AVAILABLE/API_AVAILABLE/
8296
-e s/JSC_API_DEPRECATED/API_DEPRECATED/
8397
-e "s/^JSC_CLASS_AVAILABLE/JS_EXPORT API_AVAILABLE/"

‎Source/WebKit/Scripts/postprocess-header-rule

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_defin
4949
if [[ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
5050
if [[ "${PLATFORM_NAME}" == "macosx" ]]; then
5151
[[ -n ${OSX_VERSION} ]] || OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET}
52+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
5253

5354
if [[ "${WK_PLATFORM_NAME}" == "maccatalyst" && "${LLVM_TARGET_TRIPLE_OS_VERSION}" == ios* ]]; then
5455
# On Mac Catalyst `LLVM_TARGET_TRIPLE_OS_VERSION` will be in the format `ios{major}.{minor}`.
@@ -58,15 +59,21 @@ if [[ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
5859
fi
5960
elif [[ "${PLATFORM_NAME}" =~ "iphone" ]]; then
6061
[[ -n ${IOS_VERSION} ]] || IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET}
62+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION="NA"
63+
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
64+
elif [[ "${PLATFORM_NAME}" == xr* ]]; then
65+
[[ -n ${XROS_VERSION} ]] || XROS_VERSION=${XROS_DEPLOYMENT_TARGET}
66+
[[ -n ${IOS_VERSION} ]] || IOS_VERSION="NA"
6167
[[ -n ${OSX_VERSION} ]] || OSX_VERSION="NA"
6268
fi
6369

6470
SED_OPTIONS=()
6571

66-
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
72+
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" && -n "$XROS_VERSION" ]]; then
6773
SED_OPTIONS+=(
6874
-e s/WK_MAC_TBA/${OSX_VERSION}/g
6975
-e s/WK_IOS_TBA/${IOS_VERSION}/g
76+
-e s/WK_XROS_TBA/${XROS_VERSION}/g
7077
-e s/WK_API_AVAILABLE/API_AVAILABLE/
7178
-e s/WK_API_UNAVAILABLE/API_UNAVAILABLE/
7279
-e s/WK_API_DEPRECATED/API_DEPRECATED/

‎Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
3030
@interface _WKFrameHandle : NSObject <NSCopying, NSSecureCoding>
3131

32-
@property (nonatomic, readonly) uint64_t frameID WK_API_DEPRECATED("With site isolation, this identifier may collide with frame identifiers generated in another process", macos(12.0, WK_MAC_TBA), ios(15.0, WK_IOS_TBA));
32+
@property (nonatomic, readonly) uint64_t frameID WK_API_DEPRECATED("With site isolation, this identifier may collide with frame identifiers generated in another process", macos(12.0, WK_MAC_TBA), ios(15.0, WK_IOS_TBA), visionos(1.0, WK_XROS_TBA));
3333

3434
@end

‎Source/WebKit/Shared/API/Cocoa/_WKHitTestResult.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,36 @@ typedef NS_ENUM(NSInteger, _WKHitTestResultElementType) {
3535
_WKHitTestResultElementTypeNone,
3636
_WKHitTestResultElementTypeAudio,
3737
_WKHitTestResultElementTypeVideo,
38-
} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
38+
} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
3939

4040
WK_CLASS_AVAILABLE(macos(10.12), ios(16.0))
4141
@interface _WKHitTestResult : NSObject <NSCopying>
4242

4343
@property (nonatomic, readonly, copy) NSURL *absoluteImageURL;
44-
@property (nonatomic, readonly, copy) NSString *imageMIMEType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
44+
@property (nonatomic, readonly, copy) NSString *imageMIMEType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
4545

4646
@property (nonatomic, readonly, copy) NSURL *absolutePDFURL;
4747
@property (nonatomic, readonly, copy) NSURL *absoluteLinkURL;
48-
@property (nonatomic, readonly) BOOL hasLocalDataForLinkURL WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
49-
@property (nonatomic, readonly, copy) NSString *linkLocalDataMIMEType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
48+
@property (nonatomic, readonly) BOOL hasLocalDataForLinkURL WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
49+
@property (nonatomic, readonly, copy) NSString *linkLocalDataMIMEType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
5050
@property (nonatomic, readonly, copy) NSURL *absoluteMediaURL;
5151

5252
@property (nonatomic, readonly, copy) NSString *linkLabel;
5353
@property (nonatomic, readonly, copy) NSString *linkTitle;
54-
@property (nonatomic, readonly, copy) NSString *linkSuggestedFilename WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
55-
@property (nonatomic, readonly, copy) NSString *imageSuggestedFilename WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
54+
@property (nonatomic, readonly, copy) NSString *linkSuggestedFilename WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
55+
@property (nonatomic, readonly, copy) NSString *imageSuggestedFilename WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
5656
@property (nonatomic, readonly, copy) NSString *lookupText;
5757

5858
@property (nonatomic, readonly, getter=isContentEditable) BOOL contentEditable;
59-
@property (nonatomic, readonly, getter=isSelected) BOOL selected WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
60-
@property (nonatomic, readonly, getter=isMediaDownloadable) BOOL mediaDownloadable WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
61-
@property (nonatomic, readonly, getter=isMediaFullscreen) BOOL mediaFullscreen WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
59+
@property (nonatomic, readonly, getter=isSelected) BOOL selected WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
60+
@property (nonatomic, readonly, getter=isMediaDownloadable) BOOL mediaDownloadable WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
61+
@property (nonatomic, readonly, getter=isMediaFullscreen) BOOL mediaFullscreen WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
6262

6363
@property (nonatomic, readonly) CGRect elementBoundingBox;
6464

65-
@property (nonatomic, readonly) _WKHitTestResultElementType elementType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
65+
@property (nonatomic, readonly) _WKHitTestResultElementType elementType WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
6666

67-
@property (nonatomic, readonly) WKFrameInfo *frameInfo WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
67+
@property (nonatomic, readonly) WKFrameInfo *frameInfo WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
6868

6969
@end
7070

‎Source/WebKit/UIProcess/API/Cocoa/NSAttributedStringPrivate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ WK_EXTERN NSAttributedStringDocumentReadingOptionKey const _WKReadAccessFileURLs
4242
The value is an NSNumber, which is interpreted as a BOOL.
4343
*/
4444
WK_EXTERN NSAttributedStringDocumentReadingOptionKey const _WKAllowNetworkLoadsOption
45-
NS_SWIFT_NAME(allowNetworkLoads) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
45+
NS_SWIFT_NAME(allowNetworkLoads) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
4646

4747
/*!
4848
@abstract Bundle identifier of the application to which network activity is attributed.
4949
The value is an NSString.
5050
*/
5151
WK_EXTERN NSAttributedStringDocumentReadingOptionKey const _WKSourceApplicationBundleIdentifierOption
52-
NS_SWIFT_NAME(sourceApplicationBundleIdentifier) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
52+
NS_SWIFT_NAME(sourceApplicationBundleIdentifier) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
5353

5454
/*!
5555
@discussion Private extension of @link //apple_ref/occ/NSAttributedString NSAttributedString @/link to

‎Source/WebKit/UIProcess/API/Cocoa/WKBackForwardListItem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
4242

4343
/*! @abstract Deprecated. Always returns nil.
4444
*/
45-
@property (nullable, readonly, copy) NSString *title WK_API_DEPRECATED("No longer supported", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
45+
@property (nullable, readonly, copy) NSString *title WK_API_DEPRECATED("No longer supported", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA), visionos(1.0, WK_XROS_TBA));
4646

4747
/*! @abstract The URL of the initial request that created this item.
4848
*/

‎Source/WebKit/UIProcess/API/Cocoa/WKFrameInfoPrivate.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
@property (nonatomic, readonly, copy, nullable) _WKFrameHandle *_parentFrameHandle WK_API_AVAILABLE(macos(11.0), ios(14.0));
3434
@property (nonatomic, readonly) pid_t _processIdentifier WK_API_AVAILABLE(macos(13.3), ios(16.4));
3535
@property (nonatomic, readonly) BOOL _isLocalFrame WK_API_AVAILABLE(macos(14.0), ios(17.0));
36-
@property (nonatomic, readonly) BOOL _isFocused WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
37-
@property (nonatomic, readonly) BOOL _errorOccurred WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
38-
@property (nonatomic, readonly, copy, nullable) NSString *_title WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
36+
@property (nonatomic, readonly) BOOL _isFocused WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
37+
@property (nonatomic, readonly) BOOL _errorOccurred WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
38+
@property (nonatomic, readonly, copy, nullable) NSString *_title WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
3939

4040
@end

‎Source/WebKit/UIProcess/API/Cocoa/WKMenuItemIdentifiersPrivate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
WK_EXTERN NSString * const _WKMenuItemIdentifierCopy WK_API_AVAILABLE(macos(10.12), ios(10.0));
3131
WK_EXTERN NSString * const _WKMenuItemIdentifierCopyImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
3232
WK_EXTERN NSString * const _WKMenuItemIdentifierCopyLink WK_API_AVAILABLE(macos(10.12), ios(10.0));
33-
WK_EXTERN NSString * const _WKMenuItemIdentifierCopyLinkToHighlight WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
33+
WK_EXTERN NSString * const _WKMenuItemIdentifierCopyLinkToHighlight WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
3434
WK_EXTERN NSString * const _WKMenuItemIdentifierCopyMediaLink WK_API_AVAILABLE(macos(10.14), ios(12.0));
3535
WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadImage WK_API_AVAILABLE(macos(10.12), ios(10.0));
3636
WK_EXTERN NSString * const _WKMenuItemIdentifierDownloadLinkedFile WK_API_AVAILABLE(macos(10.12), ios(10.0));
@@ -60,7 +60,7 @@ WK_EXTERN NSString * const _WKMenuItemIdentifierAddHighlightToCurrentQuickNote W
6060
WK_EXTERN NSString * const _WKMenuItemIdentifierAddHighlightToNewQuickNote WK_API_AVAILABLE(macos(12.0), ios(15.0));
6161

6262
WK_EXTERN NSString * const _WKMenuItemIdentifierTranslate WK_API_AVAILABLE(macos(12.0), ios(15.0));
63-
WK_EXTERN NSString * const _WKMenuItemIdentifierSwapCharacters WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
63+
WK_EXTERN NSString * const _WKMenuItemIdentifierSwapCharacters WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
6464
WK_EXTERN NSString * const _WKMenuItemIdentifierCopySubject WK_API_AVAILABLE(macos(13.0), ios(16.0));
6565

6666
WK_EXTERN NSString * const _WKMenuItemIdentifierSpellingMenu WK_API_AVAILABLE(macos(13.0), ios(16.0));

‎Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static const WKNavigationResponsePolicy _WKNavigationResponsePolicyBecomeDownloa
105105

106106
- (void)_webView:(WKWebView *)webView didFailLoadDueToNetworkConnectionIntegrityWithURL:(NSURL *)url WK_API_AVAILABLE(macos(13.3), ios(16.4));
107107
- (void)_webView:(WKWebView *)webView didChangeLookalikeCharactersFromURL:(NSURL *)originalURL toURL:(NSURL *)adjustedURL WK_API_AVAILABLE(macos(13.3), ios(16.4));
108-
- (void)_webView:(WKWebView *)webView didPromptForStorageAccess:(NSString *)topFrameDomain forSubFrameDomain:(NSString *)subFrameDomain forQuirk:(BOOL)forQuirk WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
108+
- (void)_webView:(WKWebView *)webView didPromptForStorageAccess:(NSString *)topFrameDomain forSubFrameDomain:(NSString *)subFrameDomain forQuirk:(BOOL)forQuirk WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
109109

110110
#if TARGET_OS_IPHONE
111111
- (void)_webView:(WKWebView *)webView didStartLoadForQuickLookDocumentInMainFrameWithFileName:(NSString *)fileName uti:(NSString *)uti;

‎Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef NS_OPTIONS(NSUInteger, _WKDebugOverlayRegions) {
3838
_WKTouchActionRegion = 1 << 2,
3939
_WKEditableElementRegion = 1 << 3,
4040
_WKInteractionRegion WK_API_AVAILABLE(macos(13.0), ios(16.0)) = 1 << 4,
41-
_WKSiteIsolationRegion WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)) = 1 << 5,
41+
_WKSiteIsolationRegion WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA)) = 1 << 5,
4242
} WK_API_AVAILABLE(macos(10.11), ios(9.0));
4343

4444
typedef NS_OPTIONS(NSUInteger, _WKJavaScriptRuntimeFlags) {
@@ -133,7 +133,7 @@ typedef NS_ENUM(NSInteger, _WKPitchCorrectionAlgorithm) {
133133

134134
@property (nonatomic, setter=_setAVFoundationEnabled:) BOOL _avFoundationEnabled WK_API_AVAILABLE(macos(10.10), ios(12.0));
135135

136-
@property (nonatomic, setter=_setTextExtractionEnabled:) BOOL _textExtractionEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
136+
@property (nonatomic, setter=_setTextExtractionEnabled:) BOOL _textExtractionEnabled WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
137137

138138
+ (NSArray<_WKFeature *> *)_features WK_API_AVAILABLE(macos(13.3), ios(16.4));
139139
- (BOOL)_isEnabledForFeature:(_WKFeature *)feature WK_API_AVAILABLE(macos(10.12), ios(10.0));
@@ -190,7 +190,7 @@ typedef NS_ENUM(NSInteger, _WKPitchCorrectionAlgorithm) {
190190
@property (nonatomic, setter=_setManagedMediaSourceEnabled:) BOOL _managedMediaSourceEnabled WK_API_AVAILABLE(macos(14.0), ios(17.0));
191191
@property (nonatomic, setter=_setManagedMediaSourceLowThreshold:) double _managedMediaSourceLowThreshold WK_API_AVAILABLE(macos(14.0), ios(17.0));
192192
@property (nonatomic, setter=_setManagedMediaSourceHighThreshold:) double _managedMediaSourceHighThreshold WK_API_AVAILABLE(macos(14.0), ios(17.0));
193-
@property (nonatomic, setter=_setMediaCapabilityGrantsEnabled:) BOOL _mediaCapabilityGrantsEnabled WK_API_AVAILABLE(ios(WK_IOS_TBA)) WK_API_UNAVAILABLE(macos);
193+
@property (nonatomic, setter=_setMediaCapabilityGrantsEnabled:) BOOL _mediaCapabilityGrantsEnabled WK_API_AVAILABLE(ios(WK_IOS_TBA), visionos(WK_XROS_TBA)) WK_API_UNAVAILABLE(macos);
194194

195195
#if !TARGET_OS_IPHONE
196196
@property (nonatomic, setter=_setWebGLEnabled:) BOOL _webGLEnabled WK_API_AVAILABLE(macos(10.13.4));
@@ -235,7 +235,7 @@ typedef NS_ENUM(NSInteger, _WKPitchCorrectionAlgorithm) {
235235

236236
@interface WKPreferences (WKPrivateDeprecated)
237237

238-
@property (nonatomic, setter=_setShouldAllowDesignSystemUIFonts:) BOOL _shouldAllowDesignSystemUIFonts WK_API_DEPRECATED("Design system UI fonts are always enabled", macos(10.15, WK_MAC_TBA), ios(13.0, WK_IOS_TBA));
238+
@property (nonatomic, setter=_setShouldAllowDesignSystemUIFonts:) BOOL _shouldAllowDesignSystemUIFonts WK_API_DEPRECATED("Design system UI fonts are always enabled", macos(10.15, WK_MAC_TBA), ios(13.0, WK_IOS_TBA), visionos(1.0, WK_XROS_TBA));
239239
@property (nonatomic, setter=_setRequestAnimationFrameEnabled:) BOOL _requestAnimationFrameEnabled WK_API_DEPRECATED("requestAnimationFrame is always enabled", macos(10.15.4, 13.0), ios(13.4, 16.0));
240240
@property (nonatomic, setter=_setSubpixelAntialiasedLayerTextEnabled:) BOOL _subpixelAntialiasedLayerTextEnabled WK_API_DEPRECATED("Subpixel antialiased text is no longer supported", macos(10.12, 13.3), ios(10.0, 16.4));
241241
#if !TARGET_OS_IPHONE
@@ -246,7 +246,7 @@ typedef NS_ENUM(NSInteger, _WKPitchCorrectionAlgorithm) {
246246
@property (nonatomic, setter=_setPlugInSnapshottingEnabled:) BOOL _plugInSnapshottingEnabled WK_API_DEPRECATED("NPAPI plugins are no longer supported", macos(10.13.4, WK_MAC_TBA));
247247
@property (nonatomic, setter=_setSubpixelCSSOMElementMetricsEnabled:) BOOL _subpixelCSSOMElementMetricsEnabled WK_API_DEPRECATED("Subpixel CSSOM element metrics are no longer supported", macos(10.13.4, 10.15));
248248
#endif
249-
@property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_DEPRECATED("Display list drawing is no longer supported", macos(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA));
249+
@property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_DEPRECATED("Display list drawing is no longer supported", macos(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA), visionos(1.0, WK_XROS_TBA));
250250
// FIXME: We should remove this property.
251251
@property (nonatomic, setter=_setOfflineApplicationCacheIsEnabled:) BOOL _offlineApplicationCacheIsEnabled;
252252

‎Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ typedef NS_ENUM(NSInteger, _WKProcessState) {
4343
_WKProcessStateForeground,
4444
_WKProcessStateBackground,
4545
_WKProcessStateSuspended,
46-
} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
46+
} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
4747

4848
typedef NS_ENUM(NSInteger, _WKWebContentProcessState) {
4949
_WKWebContentProcessStatePrewarmed,
5050
_WKWebContentProcessStateCached,
5151
_WKWebContentProcessStateActive,
52-
} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
52+
} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA));
5353

54-
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
54+
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA))
5555
@interface _WKProcessInfo : NSObject
5656
@property (nonatomic, readonly) pid_t pid;
5757
@property (nonatomic, readonly) _WKProcessState state;
@@ -60,7 +60,7 @@ WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
6060
@property (nonatomic, readonly) size_t physicalFootprint;
6161
@end
6262

63-
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
63+
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA), visionos(WK_XROS_TBA))
6464
@interface _WKWebContentProcessInfo : _WKProcessInfo
6565
@property (nonatomic, readonly) _WKWebContentProcessState webContentState;
6666
@property (nonatomic, readonly) NSArray<WKWebView *> *webViews;

0 commit comments

Comments
 (0)