<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281780] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281780">281780</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-30 15:41:08 -0700 (Mon, 30 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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 <achristensen@webkit.org> 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:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKDownloadh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKDownloadDelegateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKNavigationActionh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKNavigationDelegateh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKPreferencesh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/ChangeLog       2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2021-08-30  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><ins>+        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-30  Alex Christensen  <achristensen@webkit.org>
+
</ins><span class="cx">         Migrate PrivateClickMeasurements from ResourceLoadStatistics database to new database
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=229646
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h     2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownload.h        2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> NS_ASSUME_NONNULL_BEGIN
</span><span class="cx"> 
</span><del>-WK_CLASS_AVAILABLE(macos(12.0), ios(15.0))
</del><ins>+WK_CLASS_AVAILABLE(macos(11.3), ios(14.5))
</ins><span class="cx"> @interface WKDownload : NSObject<NSProgressReporting>
</span><span class="cx"> 
</span><span class="cx"> /* @abstract The request used to initiate this download.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKDownloadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h     2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKDownloadDelegate.h        2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> typedef NS_ENUM(NSInteger, WKDownloadRedirectPolicy) {
</span><span class="cx">     WKDownloadRedirectPolicyCancel,
</span><span class="cx">     WKDownloadRedirectPolicyAllow,
</span><del>-} NS_SWIFT_NAME(WKDownload.RedirectPolicy) WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+} NS_SWIFT_NAME(WKDownload.RedirectPolicy) WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> NS_ASSUME_NONNULL_BEGIN
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKNavigationActionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h     2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationAction.h        2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> 
</span><span class="cx"> /*! @abstract A value indicating whether the web content used a download attribute to indicate that this should be downloaded.
</span><span class="cx"> */
</span><del>-@property (nonatomic, readonly) BOOL shouldPerformDownload WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+@property (nonatomic, readonly) BOOL shouldPerformDownload WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKNavigationDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h   2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegate.h      2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> typedef NS_ENUM(NSInteger, WKNavigationActionPolicy) {
</span><span class="cx">     WKNavigationActionPolicyCancel,
</span><span class="cx">     WKNavigationActionPolicyAllow,
</span><del>-    WKNavigationActionPolicyDownload WK_API_AVAILABLE(macos(12.0), ios(15.0)),
</del><ins>+    WKNavigationActionPolicyDownload WK_API_AVAILABLE(macos(11.3), ios(14.5)),
</ins><span class="cx"> } WK_API_AVAILABLE(macos(10.10), ios(8.0));
</span><span class="cx"> 
</span><span class="cx"> /*! @enum WKNavigationResponsePolicy
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> typedef NS_ENUM(NSInteger, WKNavigationResponsePolicy) {
</span><span class="cx">     WKNavigationResponsePolicyCancel,
</span><span class="cx">     WKNavigationResponsePolicyAllow,
</span><del>-    WKNavigationResponsePolicyDownload WK_API_AVAILABLE(macos(12.0), ios(15.0)),
</del><ins>+    WKNavigationResponsePolicyDownload WK_API_AVAILABLE(macos(11.3), ios(14.5)),
</ins><span class="cx"> } WK_API_AVAILABLE(macos(10.10), ios(8.0));
</span><span class="cx"> 
</span><span class="cx"> /*! A class conforming to the WKNavigationDelegate protocol can provide
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx">  @param download The download.
</span><span class="cx">  @discussion The download needs its delegate to be set to receive updates about its progress.
</span><span class="cx"> */
</span><del>-- (void)webView:(WKWebView *)webView navigationAction:(WKNavigationAction *)navigationAction didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+- (void)webView:(WKWebView *)webView navigationAction:(WKNavigationAction *)navigationAction didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> /*
</span><span class="cx">  @abstract Called after using WKNavigationResponsePolicyDownload.
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">  @param download The download.
</span><span class="cx">  @discussion The download needs its delegate to be set to receive updates about its progress.
</span><span class="cx"> */
</span><del>-- (void)webView:(WKWebView *)webView navigationResponse:(WKNavigationResponse *)navigationResponse didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+- (void)webView:(WKWebView *)webView navigationResponse:(WKNavigationResponse *)navigationResponse didBecomeDownload:(WKDownload *)download WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h  2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h     2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> 
</span><span class="cx"> /*! @abstract A Boolean value indicating whether text interaction is disabled.
</span><span class="cx"> */
</span><del>-@property (nonatomic, getter=isTextInteractionEnabled) BOOL textInteractionEnabled WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+@property (nonatomic, getter=isTextInteractionEnabled) BOOL textInteractionEnabled WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h      2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     WKMediaPlaybackStatePlaying,
</span><span class="cx">     WKMediaPlaybackStatePaused,
</span><span class="cx">     WKMediaPlaybackStateSuspended
</span><del>-} WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+} WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> typedef NS_ENUM(NSInteger, WKMediaCaptureState) {
</span><span class="cx">     WKMediaCaptureStateNone,
</span><span class="lines">@@ -508,9 +508,9 @@
</span><span class="cx"> /* @abstract Begins a download in the context of the currently displayed webpage as if the WKNavigationDelegate turned a navigation into a download instead
</span><span class="cx">  @param request The request specifying the URL to download.
</span><span class="cx">  @param completionHandler A block called when the download has started.
</span><del>- @discussion The download needs its delegate to be set in the completionHandler to receive updates about its progress.
</del><ins>+ @discussion The download needs its delegate to be set in the completionHandler to receive updates about its progress.
</ins><span class="cx">  */
</span><del>-- (void)startDownloadUsingRequest:(NSURLRequest *)request completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+- (void)startDownloadUsingRequest:(NSURLRequest *)request completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> /* @abstract Resumes a download that failed or was canceled.
</span><span class="cx">  @param resumeData Data from a WKDownloadDelegate's didFailWithError or a WKDownload's cancel completionHandler.
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx">  @param completionHandler A block called when the download has resumed.
</span><span class="cx">  @discussion The download needs its delegate to be set in the completionHandler to receive updates about its progress.
</span><span class="cx">  */
</span><del>-- (void)resumeDownloadFromResumeData:(NSData *)resumeData completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+- (void)resumeDownloadFromResumeData:(NSData *)resumeData completionHandler:(void(^)(WKDownload *))completionHandler WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> /* @abstract The media type for the WKWebView
</span><span class="cx">  @discussion The value of mediaType will override the normal value of the CSS media property.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h (281779 => 281780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2021-08-30 22:35:31 UTC (rev 281779)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h    2021-08-30 22:41:08 UTC (rev 281780)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> /*! @abstract A Boolean value indicating whether HTTP requests to servers known to support HTTPS should be automatically upgraded to HTTPS requests.
</span><span class="cx">  @discussion The default value is YES.
</span><span class="cx">  */
</span><del>-@property (nonatomic) BOOL upgradeKnownHostsToHTTPS WK_API_AVAILABLE(macos(12.0), ios(15.0));
</del><ins>+@property (nonatomic) BOOL upgradeKnownHostsToHTTPS WK_API_AVAILABLE(macos(11.3), ios(14.5));
</ins><span class="cx"> 
</span><span class="cx"> @property (nonatomic) WKAudiovisualMediaTypes mediaTypesRequiringUserActionForPlayback WK_API_AVAILABLE(macos(10.12), ios(10.0));
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>