<!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>[278834] trunk/Source/WebCore</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/278834">278834</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-06-14 10:34:25 -0700 (Mon, 14 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Monterey] Support building WebKit (Part 2)
https://bugs.webkit.org/show_bug.cgi?id=226846
<rdar://problem/79095148>

Reviewed by Chris Dumez.

Source/WebCore:

Covered by exisiting tests.

* html/HTMLElement.cpp:
(WebCore::HTMLElement::updateWithTextRecognitionResult): Explicitly define second arugment
to avoid 'missing field' compilation error.

Source/WebCore/PAL:

* pal/spi/cf/CFNetworkSPI.h: Add nw_connection_privacy_stance_t.
* pal/spi/cocoa/PassKitSPI.h: Add PKPaymentCoupon.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalspicfCFNetworkSPIh">trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h</a></li>
<li><a href="#trunkSourceWebCorePALpalspicocoaPassKitSPIh">trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLElementcpp">trunk/Source/WebCore/html/HTMLElement.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278833 => 278834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-14 17:31:02 UTC (rev 278833)
+++ trunk/Source/WebCore/ChangeLog      2021-06-14 17:34:25 UTC (rev 278834)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-14  Jonathan Bedard  <jbedard@apple.com>
+
+        [Monterey] Support building WebKit (Part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=226846
+        <rdar://problem/79095148>
+
+        Reviewed by Chris Dumez.
+
+        Covered by exisiting tests.
+
+        * html/HTMLElement.cpp:
+        (WebCore::HTMLElement::updateWithTextRecognitionResult): Explicitly define second arugment
+        to avoid 'missing field' compilation error.
+
</ins><span class="cx"> 2021-06-14  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Micro-optimize ResourceResponseBase::sanitizeHTTPHeaderFields()
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (278833 => 278834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-06-14 17:31:02 UTC (rev 278833)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-06-14 17:34:25 UTC (rev 278834)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-06-14  Jonathan Bedard  <jbedard@apple.com>
+
+        [Monterey] Support building WebKit (Part 2)
+        https://bugs.webkit.org/show_bug.cgi?id=226846
+        <rdar://problem/79095148>
+
+        Reviewed by Chris Dumez.
+
+        * pal/spi/cf/CFNetworkSPI.h: Add nw_connection_privacy_stance_t.
+        * pal/spi/cocoa/PassKitSPI.h: Add PKPaymentCoupon.
+
</ins><span class="cx"> 2021-06-11  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Clean up some VisionKitCore soft linking code in WebKit
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (278833 => 278834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h       2021-06-14 17:31:02 UTC (rev 278833)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h  2021-06-14 17:34:25 UTC (rev 278834)
</span><span class="lines">@@ -122,6 +122,16 @@
</span><span class="cx">     CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3,
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+#if HAVE(NETWORK_CONNECTION_PRIVACY_STANCE)
+typedef enum {
+    nw_connection_privacy_stance_unknown = 0,
+    nw_connection_privacy_stance_not_eligible = 1,
+    nw_connection_privacy_stance_proxied = 2,
+    nw_connection_privacy_stance_failed = 3,
+    nw_connection_privacy_stance_direct = 4,
+} nw_connection_privacy_stance_t;
+#endif
+
</ins><span class="cx"> #if defined(__OBJC__)
</span><span class="cx"> 
</span><span class="cx"> @interface NSURLSessionTask ()
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspicocoaPassKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (278833 => 278834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h      2021-06-14 17:31:02 UTC (rev 278833)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2021-06-14 17:34:25 UTC (rev 278834)
</span><span class="lines">@@ -132,6 +132,10 @@
</span><span class="cx">     PKPaymentShippingContactInvalidError = 1,
</span><span class="cx">     PKPaymentBillingContactInvalidError,
</span><span class="cx">     PKPaymentShippingAddressUnserviceableError,
</span><ins>+#if HAVE(PASSKIT_COUPON_CODE)
+    PKPaymentCouponCodeInvalidError,
+    PKPaymentCouponCodeExpiredError,
+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> typedef NS_OPTIONS(NSUInteger, PKAddressField) {
</span><span class="lines">@@ -242,11 +246,29 @@
</span><span class="cx"> @property (nonatomic, copy) NSDecimalNumber *amount;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if HAVE(PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
+@interface PKDateComponentsRange : NSObject <NSCopying, NSSecureCoding>
+- (nullable instancetype)initWithStartDateComponents:(NSDateComponents *)startDateComponents endDateComponents:(NSDateComponents *)endDateComponents;
+@property (copy, readonly, nonatomic) NSDateComponents *startDateComponents;
+@property (copy, readonly, nonatomic) NSDateComponents *endDateComponents;
+@end
+#endif
+
</ins><span class="cx"> @interface PKShippingMethod : PKPaymentSummaryItem
</span><span class="cx"> @property (nonatomic, copy, nullable) NSString *identifier;
</span><span class="cx"> @property (nonatomic, copy, nullable) NSString *detail;
</span><ins>+#if HAVE(PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
+@property (nonatomic, copy, nullable) PKDateComponentsRange *dateComponentsRange;
+#endif
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if HAVE(PASSKIT_SHIPPING_CONTACT_EDITING_MODE)
+typedef NS_ENUM(NSUInteger, PKShippingContactEditingMode) {
+    PKShippingContactEditingModeEnabled = 1,
+    PKShippingContactEditingModeStorePickup
+};
+#endif
+
</ins><span class="cx"> @interface PKPaymentRequest : NSObject
</span><span class="cx"> + (NSArray<PKPaymentNetwork> *)availableNetworks;
</span><span class="cx"> @property (nonatomic, copy) NSString *countryCode;
</span><span class="lines">@@ -264,6 +286,16 @@
</span><span class="cx"> @property (nonatomic, copy, nullable) NSSet<NSString *> *supportedCountries;
</span><span class="cx"> @property (nonatomic, strong) NSSet<PKContactField> *requiredShippingContactFields;
</span><span class="cx"> @property (nonatomic, strong) NSSet<PKContactField> *requiredBillingContactFields;
</span><ins>+
+#if HAVE(PASSKIT_COUPON_CODE)
+@property (nonatomic, assign) BOOL supportsCouponCode;
+@property (nonatomic, copy, nullable) NSString *couponCode;
+#endif
+
+#if HAVE(PASSKIT_SHIPPING_CONTACT_EDITING_MODE)
+@property (nonatomic, assign) PKShippingContactEditingMode shippingContactEditingMode;
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @interface PKPaymentAuthorizationViewController : NSViewController
</span><span class="lines">@@ -417,6 +449,10 @@
</span><span class="cx"> @interface PKPaymentRequestUpdate : NSObject
</span><span class="cx"> - (instancetype)initWithPaymentSummaryItems:(NSArray<PKPaymentSummaryItem *> *)paymentSummaryItems;
</span><span class="cx"> @property (nonatomic, copy) NSArray<PKPaymentSummaryItem *> *paymentSummaryItems;
</span><ins>+#if HAVE(PASSKIT_COUPON_CODE)
+@property (nonatomic, copy) NSArray<PKShippingMethod *> *shippingMethods;
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @interface PKPaymentRequestPaymentMethodUpdate : PKPaymentRequestUpdate
</span><span class="lines">@@ -430,6 +466,12 @@
</span><span class="cx"> @interface PKPaymentRequestShippingMethodUpdate : PKPaymentRequestUpdate
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if HAVE(PASSKIT_COUPON_CODE)
+@interface PKPaymentRequestCouponCodeUpdate : PKPaymentRequestUpdate
+- (instancetype)initWithErrors:(nullable NSArray<NSError *> *)errors paymentSummaryItems:(NSArray<PKPaymentSummaryItem *> *)paymentSummaryItems shippingMethods:(NSArray<PKShippingMethod *> *)shippingMethods;
+@end
+#endif
+
</ins><span class="cx"> NS_ASSUME_NONNULL_END
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLElement.cpp (278833 => 278834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLElement.cpp        2021-06-14 17:31:02 UTC (rev 278833)
+++ trunk/Source/WebCore/html/HTMLElement.cpp   2021-06-14 17:34:25 UTC (rev 278834)
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx">                 continue;
</span><span class="cx"> 
</span><span class="cx">             if (lineOrDataDetector.classList().contains(imageOverlayLineClass)) {
</span><del>-                TextRecognitionLineElements lineElements { lineOrDataDetector };
</del><ins>+                TextRecognitionLineElements lineElements { lineOrDataDetector, { } };
</ins><span class="cx">                 for (auto& text : childrenOfType<HTMLDivElement>(lineOrDataDetector))
</span><span class="cx">                     lineElements.children.append(text);
</span><span class="cx">                 textRecognitionElements.lines.append(WTFMove(lineElements));
</span><span class="lines">@@ -1427,7 +1427,7 @@
</span><span class="cx">             auto lineContainer = HTMLDivElement::create(document());
</span><span class="cx">             lineContainer->classList().add(imageOverlayLineClass);
</span><span class="cx">             rootContainer->appendChild(lineContainer);
</span><del>-            TextRecognitionLineElements lineElements { lineContainer };
</del><ins>+            TextRecognitionLineElements lineElements { lineContainer, { } };
</ins><span class="cx">             lineElements.children.reserveInitialCapacity(line.children.size());
</span><span class="cx">             for (size_t childIndex = 0; childIndex < line.children.size(); ++childIndex) {
</span><span class="cx">                 auto& child = line.children[childIndex];
</span></span></pre>
</div>
</div>

</body>
</html>