Modified: trunk/Source/WebCore/ChangeLog (283170 => 283171)
--- 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)
@@ -1,3 +1,13 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ 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):
+
2021-09-28 Antti Koivisto <[email protected]>
[CSS Cascade Layers] Add CSSOM interface
Modified: trunk/Source/WebCore/PAL/ChangeLog (283170 => 283171)
--- 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)
@@ -1,3 +1,13 @@
+2021-09-28 Alex Christensen <[email protected]>
+
+ 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:
+
2021-09-24 Jonathan Bedard <[email protected]>
[iOS 15] Support building WebKit (Part 3)
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (283170 => 283171)
--- 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)
@@ -23,6 +23,14 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
+#import <PassKit/PKRecurringPaymentSummaryItem.h>
+#endif
+
+#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
+#import <PassKit/PKDeferredPaymentSummaryItem.h>
+#endif
+
#if !PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
// FIXME: PassKit does not declare its NSString constant symbols with C linkage, so we end up with
@@ -33,7 +41,7 @@
#import <PassKit/PKError.h>
WTF_EXTERN_C_END
-#endif
+#endif // !PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
#if USE(APPLE_INTERNAL_SDK)
@@ -63,10 +71,6 @@
#import <PassKitCore/PKRecurringPaymentSummaryItem.h>
#endif
-#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
-#import <PassKitCore/PKDeferredPaymentSummaryItem.h>
-#endif
-
#if HAVE(PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
#import <PassKitCore/PKDateComponentsRange.h>
#endif
@@ -73,7 +77,7 @@
#import <WebKitAdditions/PassKitSPIAdditions.h>
-#else
+#else // USE(APPLE_INTERNAL_SDK)
#import <Foundation/Foundation.h>
@@ -156,6 +160,7 @@
PKMerchantCapabilityDebit = 1UL << 3
};
+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
typedef NS_ENUM(NSInteger, PKPaymentAuthorizationStatus) {
PKPaymentAuthorizationStatusSuccess,
PKPaymentAuthorizationStatusFailure,
@@ -166,6 +171,7 @@
PKPaymentAuthorizationStatusPINIncorrect,
PKPaymentAuthorizationStatusPINLockout,
};
+#endif
typedef NS_ENUM(NSUInteger, PKPaymentMethodType) {
PKPaymentMethodTypeUnknown = 0,
@@ -183,10 +189,12 @@
PKPaymentPassActivationStateDeactivated
};
+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
typedef NS_ENUM(NSUInteger, PKPaymentSummaryItemType) {
PKPaymentSummaryItemTypeFinal,
PKPaymentSummaryItemTypePending
};
+#endif
typedef NS_ENUM(NSUInteger, PKShippingType) {
PKShippingTypeShipping,
@@ -241,6 +249,7 @@
@property (nonatomic, strong, readonly, nullable) PKContact *shippingContact;
@end
+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
@interface PKPaymentSummaryItem : NSObject
+ (instancetype)summaryItemWithLabel:(NSString *)label amount:(NSDecimalNumber *)amount;
+ (instancetype)summaryItemWithLabel:(NSString *)label amount:(NSDecimalNumber *)amount type:(PKPaymentSummaryItemType)type;
@@ -247,6 +256,7 @@
@property (nonatomic, copy) NSString *label;
@property (nonatomic, copy) NSDecimalNumber *amount;
@end
+#endif
#if HAVE(PASSKIT_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
@interface PKDateComponentsRange : NSObject <NSCopying, NSSecureCoding>
@@ -419,6 +429,7 @@
#endif // USE(APPLE_INTERNAL_SDK)
#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
+#if !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
typedef NS_ENUM(NSInteger, PKPaymentButtonStyle) {
PKPaymentButtonStyleWhite = 0,
PKPaymentButtonStyleWhiteOutline,
@@ -437,10 +448,8 @@
PKPaymentButtonTypeSubscribe,
#endif
};
-#endif
+#endif // !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
-#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
-
NS_ASSUME_NONNULL_BEGIN
@interface PKPaymentAuthorizationResult : NSObject
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SystemPreviewSPI.h (283170 => 283171)
--- 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)
@@ -29,8 +29,10 @@
#import <AssetViewer/ASVInlinePreview.h>
#endif
-#else
+#else // USE(APPLE_INTERNAL_SDK)
+NS_ASSUME_NONNULL_BEGIN
+
#if ENABLE(ARKIT_INLINE_PREVIEW_MAC)
@class ASVInlinePreview;
@@ -48,6 +50,8 @@
@end
-#endif
+#endif // ENABLE(ARKIT_INLINE_PREVIEW_MAC)
-#endif
+NS_ASSUME_NONNULL_END
+
+#endif // USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/platform/mac/PlatformSpeechSynthesizerMac.mm (283170 => 283171)
--- 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)
@@ -227,7 +227,7 @@
if (!userLocale)
return nil;
-#if HAVE(SPEECHSYNTHESIS_MONTEREY_SPI) && USE(APPLE_INTERNAL_SDK)
+#if HAVE(SPEECHSYNTHESIS_MONTEREY_SPI)
return adoptCF(CopyIdentifierStringForPreferredVoiceInListWithLocale(speechSynthesisGetVoiceIdentifiers().get(), (__bridge CFLocaleRef)userLocale));
#else
return GetIdentifierStringForPreferredVoiceInListWithLocale(speechSynthesisGetVoiceIdentifiers().get(), (__bridge CFLocaleRef)userLocale);
