<!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>[283171] 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/283171">283171</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-09-28 09:09:18 -0700 (Tue, 28 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix build with non-internal Monterey SDK
https://bugs.webkit.org/show_bug.cgi?id=230872

Patch by Alex Christensen <achristensen@webkit.org> on 2021-09-28
Reviewed by Jonathan Bedard.

Source/WebCore:

* platform/mac/PlatformSpeechSynthesizerMac.mm:
(WebCore::speechSynthesisGetDefaultVoiceIdentifierForLocale):

Source/WebCore/PAL:

* pal/spi/cocoa/PassKitSPI.h:
* pal/spi/mac/SystemPreviewSPI.h:</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="#trunkSourceWebCorePALpalspicocoaPassKitSPIh">trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h</a></li>
<li><a href="#trunkSourceWebCorePALpalspimacSystemPreviewSPIh">trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPlatformSpeechSynthesizerMacmm">trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283170 => 283171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-09-28 15:40:24 UTC (rev 283170)
+++ trunk/Source/WebCore/ChangeLog      2021-09-28 16:09:18 UTC (rev 283171)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-09-28  Alex Christensen  <achristensen@webkit.org>
+
+        Fix build with non-internal Monterey SDK
+        https://bugs.webkit.org/show_bug.cgi?id=230872
+
+        Reviewed by Jonathan Bedard.
+
+        * platform/mac/PlatformSpeechSynthesizerMac.mm:
+        (WebCore::speechSynthesisGetDefaultVoiceIdentifierForLocale):
+
</ins><span class="cx"> 2021-09-28  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [CSS Cascade Layers] Add CSSOM interface
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (283170 => 283171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2021-09-28 15:40:24 UTC (rev 283170)
+++ trunk/Source/WebCore/PAL/ChangeLog  2021-09-28 16:09:18 UTC (rev 283171)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-09-28  Alex Christensen  <achristensen@webkit.org>
+
+        Fix build with non-internal Monterey SDK
+        https://bugs.webkit.org/show_bug.cgi?id=230872
+
+        Reviewed by Jonathan Bedard.
+
+        * pal/spi/cocoa/PassKitSPI.h:
+        * pal/spi/mac/SystemPreviewSPI.h:
+
</ins><span class="cx"> 2021-09-24  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS 15] Support building WebKit (Part 3)
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspicocoaPassKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (283170 => 283171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h      2021-09-28 15:40:24 UTC (rev 283170)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2021-09-28 16:09:18 UTC (rev 283171)
</span><span class="lines">@@ -23,6 +23,14 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
+#import <PassKit/PKRecurringPaymentSummaryItem.h>
+#endif
+
+#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
+#import <PassKit/PKDeferredPaymentSummaryItem.h>
+#endif
+
</ins><span class="cx"> #if !PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> 
</span><span class="cx"> // FIXME: PassKit does not declare its NSString constant symbols with C linkage, so we end up with
</span><span class="lines">@@ -33,7 +41,7 @@
</span><span class="cx"> #import <PassKit/PKError.h>
</span><span class="cx"> WTF_EXTERN_C_END
</span><span class="cx"> 
</span><del>-#endif
</del><ins>+#endif // !PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> 
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> 
</span><span class="lines">@@ -63,10 +71,6 @@
</span><span class="cx"> #import <PassKitCore/PKRecurringPaymentSummaryItem.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
-#import <PassKitCore/PKDeferredPaymentSummaryItem.h>
-#endif
-
</del><span class="cx"> #if HAVE(PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
</span><span class="cx"> #import <PassKitCore/PKDateComponentsRange.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -73,7 +77,7 @@
</span><span class="cx"> 
</span><span class="cx"> #import <WebKitAdditions/PassKitSPIAdditions.h>
</span><span class="cx"> 
</span><del>-#else
</del><ins>+#else // USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> 
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> 
</span><span class="lines">@@ -156,6 +160,7 @@
</span><span class="cx">     PKMerchantCapabilityDebit = 1UL << 3
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
</ins><span class="cx"> typedef NS_ENUM(NSInteger, PKPaymentAuthorizationStatus) {
</span><span class="cx">     PKPaymentAuthorizationStatusSuccess,
</span><span class="cx">     PKPaymentAuthorizationStatusFailure,
</span><span class="lines">@@ -166,6 +171,7 @@
</span><span class="cx">     PKPaymentAuthorizationStatusPINIncorrect,
</span><span class="cx">     PKPaymentAuthorizationStatusPINLockout,
</span><span class="cx"> };
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> typedef NS_ENUM(NSUInteger, PKPaymentMethodType) {
</span><span class="cx">     PKPaymentMethodTypeUnknown = 0,
</span><span class="lines">@@ -183,10 +189,12 @@
</span><span class="cx">     PKPaymentPassActivationStateDeactivated
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
</ins><span class="cx"> typedef NS_ENUM(NSUInteger, PKPaymentSummaryItemType) {
</span><span class="cx">     PKPaymentSummaryItemTypeFinal,
</span><span class="cx">     PKPaymentSummaryItemTypePending
</span><span class="cx"> };
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> typedef NS_ENUM(NSUInteger, PKShippingType) {
</span><span class="cx">     PKShippingTypeShipping,
</span><span class="lines">@@ -241,6 +249,7 @@
</span><span class="cx"> @property (nonatomic, strong, readonly, nullable) PKContact *shippingContact;
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
</ins><span class="cx"> @interface PKPaymentSummaryItem : NSObject
</span><span class="cx"> + (instancetype)summaryItemWithLabel:(NSString *)label amount:(NSDecimalNumber *)amount;
</span><span class="cx"> + (instancetype)summaryItemWithLabel:(NSString *)label amount:(NSDecimalNumber *)amount type:(PKPaymentSummaryItemType)type;
</span><span class="lines">@@ -247,6 +256,7 @@
</span><span class="cx"> @property (nonatomic, copy) NSString *label;
</span><span class="cx"> @property (nonatomic, copy) NSDecimalNumber *amount;
</span><span class="cx"> @end
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> #if HAVE(PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
</span><span class="cx"> @interface PKDateComponentsRange : NSObject <NSCopying, NSSecureCoding>
</span><span class="lines">@@ -419,6 +429,7 @@
</span><span class="cx"> #endif // USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
</span><ins>+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
</ins><span class="cx"> typedef NS_ENUM(NSInteger, PKPaymentButtonStyle) {
</span><span class="cx">     PKPaymentButtonStyleWhite = 0,
</span><span class="cx">     PKPaymentButtonStyleWhiteOutline,
</span><span class="lines">@@ -437,10 +448,8 @@
</span><span class="cx">     PKPaymentButtonTypeSubscribe,
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><del>-#endif
</del><ins>+#endif // !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
</ins><span class="cx"> 
</span><del>-#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
-
</del><span class="cx"> NS_ASSUME_NONNULL_BEGIN
</span><span class="cx"> 
</span><span class="cx"> @interface PKPaymentAuthorizationResult : NSObject
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalspimacSystemPreviewSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h (283170 => 283171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h  2021-09-28 15:40:24 UTC (rev 283170)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h     2021-09-28 16:09:18 UTC (rev 283171)
</span><span class="lines">@@ -29,8 +29,10 @@
</span><span class="cx"> #import <AssetViewer/ASVInlinePreview.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#else
</del><ins>+#else // USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> 
</span><ins>+NS_ASSUME_NONNULL_BEGIN
+
</ins><span class="cx"> #if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
</span><span class="cx"> 
</span><span class="cx"> @class ASVInlinePreview;
</span><span class="lines">@@ -48,6 +50,8 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><del>-#endif
</del><ins>+#endif // ENABLE(ARKIT_INLINE_PREVIEW_MAC)
</ins><span class="cx"> 
</span><del>-#endif
</del><ins>+NS_ASSUME_NONNULL_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPlatformSpeechSynthesizerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (283170 => 283171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm        2021-09-28 15:40:24 UTC (rev 283170)
+++ trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm   2021-09-28 16:09:18 UTC (rev 283171)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">     if (!userLocale)
</span><span class="cx">         return nil;
</span><span class="cx"> 
</span><del>-#if HAVE(SPEECHSYNTHESIS_MONTEREY_SPI) && USE(APPLE_INTERNAL_SDK)
</del><ins>+#if HAVE(SPEECHSYNTHESIS_MONTEREY_SPI)
</ins><span class="cx">     return adoptCF(CopyIdentifierStringForPreferredVoiceInListWithLocale(speechSynthesisGetVoiceIdentifiers().get(), (__bridge CFLocaleRef)userLocale));
</span><span class="cx"> #else
</span><span class="cx">     return GetIdentifierStringForPreferredVoiceInListWithLocale(speechSynthesisGetVoiceIdentifiers().get(), (__bridge CFLocaleRef)userLocale);
</span></span></pre>
</div>
</div>

</body>
</html>