Title: [292470] trunk/Source/WebCore/PAL
- Revision
- 292470
- Author
- jbed...@apple.com
- Date
- 2022-04-06 08:40:43 -0700 (Wed, 06 Apr 2022)
Log Message
Support PKShippingMethods on iOS
https://bugs.webkit.org/show_bug.cgi?id=238845
<rdar://problem/91320467>
Reviewed by Devin Rousso.
* Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h: Move PKShippingMethods SPI declarations out of MacOS specific #ifdefs.
Canonical link: https://commits.webkit.org/249321@main
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (292469 => 292470)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-04-06 15:22:41 UTC (rev 292469)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-04-06 15:40:43 UTC (rev 292470)
@@ -1,3 +1,13 @@
+2022-04-05 Jonathan Bedard <jbed...@apple.com>
+
+ Support PKShippingMethods on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=238845
+ <rdar://problem/91320467>
+
+ Reviewed by Devin Rousso.
+
+ * pal/spi/cocoa/PassKitSPI.h: Move PKShippingMethods SPI declarations out of MacOS specific #ifdefs.
+
2022-04-05 Elliott Williams <e...@apple.com>
[XCBuild] PAL: Add headers-only dependency on WebGPU
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (292469 => 292470)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2022-04-06 15:22:41 UTC (rev 292469)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2022-04-06 15:40:43 UTC (rev 292470)
@@ -320,12 +320,6 @@
#endif
@end
-#if HAVE(PASSKIT_DEFAULT_SHIPPING_METHOD)
-@interface PKShippingMethods : NSObject
-- (instancetype)initWithMethods:(NSArray<PKShippingMethod *> *)methods defaultMethod:(nullable PKShippingMethod *)defaultMethod;
-@end
-#endif
-
#if HAVE(PASSKIT_SHIPPING_CONTACT_EDITING_MODE)
typedef NS_ENUM(NSUInteger, PKShippingContactEditingMode) {
PKShippingContactEditingModeEnabled = 1,
@@ -356,10 +350,6 @@
@property (nonatomic, copy, nullable) NSString *couponCode;
#endif
-#if HAVE(PASSKIT_DEFAULT_SHIPPING_METHOD)
-@property (nonatomic, copy) PKShippingMethods *availableShippingMethods;
-#endif
-
#if HAVE(PASSKIT_SHIPPING_CONTACT_EDITING_MODE)
@property (nonatomic, assign) PKShippingContactEditingMode shippingContactEditingMode;
#endif
@@ -522,9 +512,6 @@
#if HAVE(PASSKIT_UPDATE_SHIPPING_METHODS_WHEN_CHANGING_SUMMARY_ITEMS)
@property (nonatomic, copy) NSArray<PKShippingMethod *> *shippingMethods;
#endif
-#if HAVE(PASSKIT_DEFAULT_SHIPPING_METHOD)
-@property (nonatomic, copy) PKShippingMethods *availableShippingMethods;
-#endif
@end
@interface PKPaymentRequestPaymentMethodUpdate : PKPaymentRequestUpdate
@@ -549,6 +536,24 @@
#endif
+NS_ASSUME_NONNULL_BEGIN
+
+#if HAVE(PASSKIT_DEFAULT_SHIPPING_METHOD) && !USE(APPLE_INTERNAL_SDK)
+@interface PKShippingMethods : NSObject
+- (instancetype)initWithMethods:(NSArray<PKShippingMethod *> *)methods defaultMethod:(nullable PKShippingMethod *)defaultMethod;
+@end
+
+@interface PKPaymentRequest ()
+@property (nonatomic, copy) PKShippingMethods *availableShippingMethods;
+@end
+
+@interface PKPaymentRequestUpdate ()
+@property (nonatomic, copy) PKShippingMethods *availableShippingMethods;
+@end
+#endif // HAVE(PASSKIT_DEFAULT_SHIPPING_METHOD) && !USE(APPLE_INTERNAL_SDK)
+
+NS_ASSUME_NONNULL_END
+
extern "C"
void PKDrawApplePayButtonWithCornerRadius(_Nonnull CGContextRef, CGRect drawRect, CGFloat scale, CGFloat cornerRadius, PKPaymentButtonType, PKPaymentButtonStyle, NSString * _Nullable languageCode);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
