Diff
Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog 2021-09-02 01:05:03 UTC (rev 281897)
@@ -1,3 +1,42 @@
+2021-09-01 Russell Epstein <[email protected]>
+
+ Cherry-pick r281780. rdar://problem/82650791
+
+ Update availability macros for APIs available in iOS 14.5 and macOS 11.3
+ https://bugs.webkit.org/show_bug.cgi?id=229466
+
+ Patch by Alex Christensen <[email protected]> on 2021-08-30
+ Reviewed by Chris Dumez.
+
+ We mistakenly updated them to 15.0/12.0
+
+ * UIProcess/API/Cocoa/WKDownload.h:
+ * UIProcess/API/Cocoa/WKDownloadDelegate.h:
+ * UIProcess/API/Cocoa/WKNavigationAction.h:
+ * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-30 Alex Christensen <[email protected]>
+
+ Update availability macros for APIs available in iOS 14.5 and macOS 11.3
+ https://bugs.webkit.org/show_bug.cgi?id=229466
+
+ Reviewed by Chris Dumez.
+
+ We mistakenly updated them to 15.0/12.0
+
+ * UIProcess/API/Cocoa/WKDownload.h:
+ * UIProcess/API/Cocoa/WKDownloadDelegate.h:
+ * UIProcess/API/Cocoa/WKNavigationAction.h:
+ * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+
2021-08-25 Alan Coon <[email protected]>
Cherry-pick r281595. rdar://problem/82365117
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -33,7 +33,7 @@
NS_ASSUME_NONNULL_BEGIN
-WK_CLASS_AVAILABLE(macos(12.0), ios(15.0))
+WK_CLASS_AVAILABLE(macos(11.3), ios(14.5))
@interface WKDownload : NSObject<NSProgressReporting>
/* @abstract The request used to initiate this download.
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -36,7 +36,7 @@
typedef NS_ENUM(NSInteger, WKDownloadRedirectPolicy) {
WKDownloadRedirectPolicyCancel,
WKDownloadRedirectPolicyAllow,
-} NS_SWIFT_NAME(WKDownload.RedirectPolicy) WK_API_AVAILABLE(macos(12.0), ios(15.0));
+} NS_SWIFT_NAME(WKDownload.RedirectPolicy) WK_API_AVAILABLE(macos(11.3), ios(14.5));
NS_ASSUME_NONNULL_BEGIN
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -78,7 +78,7 @@
/*! @abstract A value indicating whether the web content used a download attribute to indicate that this should be downloaded.
*/
-@property (nonatomic, readonly) BOOL shouldPerformDownload WK_API_AVAILABLE(macos(12.0), ios(15.0));
+@property (nonatomic, readonly) BOOL shouldPerformDownload WK_API_AVAILABLE(macos(11.3), ios(14.5));
#if !TARGET_OS_IPHONE
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -46,7 +46,7 @@
typedef NS_ENUM(NSInteger, WKNavigationActionPolicy) {
WKNavigationActionPolicyCancel,
WKNavigationActionPolicyAllow,
- WKNavigationActionPolicyDownload WK_API_AVAILABLE(macos(12.0), ios(15.0)),
+ WKNavigationActionPolicyDownload WK_API_AVAILABLE(macos(11.3), ios(14.5)),
} WK_API_AVAILABLE(macos(10.10), ios(8.0));
/*! @enum WKNavigationResponsePolicy
@@ -58,7 +58,7 @@
typedef NS_ENUM(NSInteger, WKNavigationResponsePolicy) {
WKNavigationResponsePolicyCancel,
WKNavigationResponsePolicyAllow,
- WKNavigationResponsePolicyDownload WK_API_AVAILABLE(macos(12.0), ios(15.0)),
+ WKNavigationResponsePolicyDownload WK_API_AVAILABLE(macos(11.3), ios(14.5)),
} WK_API_AVAILABLE(macos(10.10), ios(8.0));
/*! A class conforming to the WKNavigationDelegate protocol can provide
@@ -176,7 +176,7 @@
@param download The download.
@discussion The download needs its delegate to be set to receive updates about its progress.
*/
-- (void)webView:(WKWebView *)webView navigationAction:(WKNavigationAction *)navigationAction didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(12.0), ios(15.0));
+- (void)webView:(WKWebView *)webView navigationAction:(WKNavigationAction *)navigationAction didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(11.3), ios(14.5));
/*
@abstract Called after using WKNavigationResponsePolicyDownload.
@@ -185,7 +185,7 @@
@param download The download.
@discussion The download needs its delegate to be set to receive updates about its progress.
*/
-- (void)webView:(WKWebView *)webView navigationResponse:(WKNavigationResponse *)navigationResponse didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(12.0), ios(15.0));
+- (void)webView:(WKWebView *)webView navigationResponse:(WKNavigationResponse *)navigationResponse didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(11.3), ios(14.5));
@end
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -62,7 +62,7 @@
/*! @abstract A Boolean value indicating whether text interaction is disabled.
*/
-@property (nonatomic, getter=isTextInteractionEnabled) BOOL textInteractionEnabled WK_API_AVAILABLE(macos(12.0), ios(15.0));
+@property (nonatomic, getter=isTextInteractionEnabled) BOOL textInteractionEnabled WK_API_AVAILABLE(macos(11.3), ios(14.5));
@end
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -66,7 +66,7 @@
WKMediaPlaybackStatePlaying,
WKMediaPlaybackStatePaused,
WKMediaPlaybackStateSuspended
-} WK_API_AVAILABLE(macos(12.0), ios(15.0));
+} WK_API_AVAILABLE(macos(11.3), ios(14.5));
typedef NS_ENUM(NSInteger, WKMediaCaptureState) {
WKMediaCaptureStateNone,
@@ -508,9 +508,9 @@
/* @abstract Begins a download in the context of the currently displayed webpage as if the WKNavigationDelegate turned a navigation into a download instead
@param request The request specifying the URL to download.
@param completionHandler A block called when the download has started.
- @discussion The download needs its delegate to be set in the completionHandler to receive updates about its progress.
+ @discussion The download needs its delegate to be set in the completionHandler to receive updates about its progress.
*/
-- (void)startDownloadUsingRequest:(NSURLRequest *)request completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(12.0), ios(15.0));
+- (void)startDownloadUsingRequest:(NSURLRequest *)request completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(11.3), ios(14.5));
/* @abstract Resumes a download that failed or was canceled.
@param resumeData Data from a WKDownloadDelegate's didFailWithError or a WKDownload's cancel completionHandler.
@@ -517,7 +517,7 @@
@param completionHandler A block called when the download has resumed.
@discussion The download needs its delegate to be set in the completionHandler to receive updates about its progress.
*/
-- (void)resumeDownloadFromResumeData:(NSData *)resumeData completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(12.0), ios(15.0));
+- (void)resumeDownloadFromResumeData:(NSData *)resumeData completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(11.3), ios(14.5));
/* @abstract The media type for the WKWebView
@discussion The value of mediaType will override the normal value of the CSS media property.
Modified: branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h (281896 => 281897)
--- branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2021-09-02 01:04:59 UTC (rev 281896)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2021-09-02 01:05:03 UTC (rev 281897)
@@ -131,7 +131,7 @@
/*! @abstract A Boolean value indicating whether HTTP requests to servers known to support HTTPS should be automatically upgraded to HTTPS requests.
@discussion The default value is YES.
*/
-@property (nonatomic) BOOL upgradeKnownHostsToHTTPS WK_API_AVAILABLE(macos(12.0), ios(15.0));
+@property (nonatomic) BOOL upgradeKnownHostsToHTTPS WK_API_AVAILABLE(macos(11.3), ios(14.5));
@property (nonatomic) WKAudiovisualMediaTypes mediaTypesRequiringUserActionForPlayback WK_API_AVAILABLE(macos(10.12), ios(10.0));
