From 5c45d4e6dd20d8d0644946ffb6989f122de60d91 Mon Sep 17 00:00:00 2001 From: Elliott Williams Date: Wed, 12 Apr 2023 11:51:56 -0700 Subject: [PATCH] Cherry-pick 262840@main (156322851446). https://bugs.webkit.org/show_bug.cgi?id=255297 Update SPI availability declarations for iOS 16.5 and macOS 13.4 https://bugs.webkit.org/show_bug.cgi?id=255297 Reviewed by Alexey Proskuryakov. Replace TBA macros with the OS versions these declarations are available in. * Source/WebKit/UIProcess/API/Cocoa/WKContentRuleListPrivate.h: * Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h: Canonical link: https://commits.webkit.org/262840@main Canonical link: https://commits.webkit.org/259548.633@safari-7615-branch --- Source/WebKit/UIProcess/API/Cocoa/WKContentRuleListPrivate.h | 2 +- Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKContentRuleListPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKContentRuleListPrivate.h index 9c2b5d6e1630..ef0077e9ceda 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKContentRuleListPrivate.h +++ b/Source/WebKit/UIProcess/API/Cocoa/WKContentRuleListPrivate.h @@ -28,6 +28,6 @@ @interface WKContentRuleList (WKPrivate) + (BOOL)_supportsRegularExpression:(NSString *)regex WK_API_AVAILABLE(macos(12.0), ios(15.0)); -+ (NSError *)_parseRuleList:(NSString *)ruleList WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA)); ++ (NSError *)_parseRuleList:(NSString *)ruleList WK_API_AVAILABLE(macos(13.4), ios(16.5)); @end diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h index a4ef9948f352..ac84f41efca4 100644 --- a/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h +++ b/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h @@ -279,7 +279,7 @@ struct UIEdgeInsets; - (BOOL)_webViewCanBecomeFocused:(WKWebView *)webView WK_API_AVAILABLE(ios(15.0)); - (BOOL)_webView:(WKWebView *)webView touchEventsMustRequireGestureRecognizerToFail:(UIGestureRecognizer *)gestureRecognizer WK_API_AVAILABLE(ios(15.0)); -- (BOOL)_webView:(WKWebView *)webView gestureRecognizerCanBePreventedByTouchEvents:(UIGestureRecognizer *)gestureRecognizer WK_API_AVAILABLE(ios(WK_IOS_TBA)); +- (BOOL)_webView:(WKWebView *)webView gestureRecognizerCanBePreventedByTouchEvents:(UIGestureRecognizer *)gestureRecognizer WK_API_AVAILABLE(ios(16.5)); #else // !TARGET_OS_IPHONE