Title: [217873] trunk/Source
- Revision
- 217873
- Author
- [email protected]
- Date
- 2017-06-06 21:12:25 -0700 (Tue, 06 Jun 2017)
Log Message
Fixed building with the macOS 10.13 Apple Internal SDK when targeting macOS 10.12.
Source/WebCore:
* platform/spi/cocoa/PassKitSPI.h:
Source/WebKit2:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didAuthorizePayment:handler:]):
(-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectPaymentMethod:handler:]):
(-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectShippingMethod:handler:]):
(-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectShippingContact:handler:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (217872 => 217873)
--- trunk/Source/WebCore/ChangeLog 2017-06-07 03:46:57 UTC (rev 217872)
+++ trunk/Source/WebCore/ChangeLog 2017-06-07 04:12:25 UTC (rev 217873)
@@ -1,3 +1,9 @@
+2017-06-06 Dan Bernstein <[email protected]>
+
+ Fixed building with the macOS 10.13 Apple Internal SDK when targeting macOS 10.12.
+
+ * platform/spi/cocoa/PassKitSPI.h:
+
2017-06-06 Chris Dumez <[email protected]>
Unreviewed, rolling out r214974.
Modified: trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h (217872 => 217873)
--- trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2017-06-07 03:46:57 UTC (rev 217872)
+++ trunk/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2017-06-07 04:12:25 UTC (rev 217873)
@@ -43,6 +43,13 @@
NS_ASSUME_NONNULL_BEGIN
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+@class PKPaymentAuthorizationResult;
+@class PKPaymentRequestPaymentMethodUpdate;
+@class PKPaymentRequestShippingMethodUpdate;
+@class PKPaymentRequestShippingContactUpdate;
+#endif
+
typedef NS_OPTIONS(NSUInteger, PKAddressField) {
PKAddressFieldNone = 0UL,
PKAddressFieldPostalAddress = 1UL << 0,
Modified: trunk/Source/WebKit2/ChangeLog (217872 => 217873)
--- trunk/Source/WebKit2/ChangeLog 2017-06-07 03:46:57 UTC (rev 217872)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-07 04:12:25 UTC (rev 217873)
@@ -1,3 +1,13 @@
+2017-06-06 Dan Bernstein <[email protected]>
+
+ Fixed building with the macOS 10.13 Apple Internal SDK when targeting macOS 10.12.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didAuthorizePayment:handler:]):
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectPaymentMethod:handler:]):
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectShippingMethod:handler:]):
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewController:didSelectShippingContact:handler:]):
+
2017-06-06 Brent Fulgham <[email protected]>
[WK2][Cocoa] Allow network process to bind addresses without webrtc extension
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (217872 => 217873)
--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-06-07 03:46:57 UTC (rev 217872)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-06-07 04:12:25 UTC (rev 217873)
@@ -153,9 +153,11 @@
return result;
}
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
+
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment handler:(void (^)(PKPaymentAuthorizationResult *result))completion
{
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
if (!_webPaymentCoordinatorProxy) {
completion(adoptNS([allocPKPaymentAuthorizationResultInstance() initWithStatus:PKPaymentAuthorizationStatusFailure errors:@[ ]]).get());
return;
@@ -165,10 +167,12 @@
_paymentAuthorizedCompletion = completion;
_webPaymentCoordinatorProxy->didAuthorizePayment(WebCore::Payment(payment));
+#endif
}
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectPaymentMethod:(PKPaymentMethod *)paymentMethod handler:(void (^)(PKPaymentRequestPaymentMethodUpdate *update))completion
{
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
if (!_webPaymentCoordinatorProxy) {
completion(adoptNS([allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:@[ ]]).get());
return;
@@ -177,9 +181,11 @@
ASSERT(!_didSelectPaymentMethodCompletion);
_didSelectPaymentMethodCompletion = completion;
_webPaymentCoordinatorProxy->didSelectPaymentMethod(WebCore::PaymentMethod(paymentMethod));
+#endif
}
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingMethod:(PKShippingMethod *)shippingMethod handler:(void (^)(PKPaymentRequestShippingMethodUpdate *update))completion {
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
if (!_webPaymentCoordinatorProxy) {
completion(adoptNS([allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:@[ ]]).get());
return;
@@ -188,10 +194,12 @@
ASSERT(!_didSelectShippingMethodCompletion);
_didSelectShippingMethodCompletion = completion;
_webPaymentCoordinatorProxy->didSelectShippingMethod(toShippingMethod(shippingMethod));
+#endif
}
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingContact:(PKContact *)contact handler:(void (^)(PKPaymentRequestShippingContactUpdate *update))completion
{
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
if (!_webPaymentCoordinatorProxy) {
completion(adoptNS([allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:@[ ] paymentSummaryItems:@[ ] shippingMethods:@[ ]]).get());
return;
@@ -200,8 +208,13 @@
ASSERT(!_didSelectShippingContactCompletion);
_didSelectShippingContactCompletion = completion;
_webPaymentCoordinatorProxy->didSelectShippingContact(WebCore::PaymentContact(contact));
+#endif
}
-#else
+
+#endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)
+
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment completion:(void (^)(PKPaymentAuthorizationStatus))completion
{
if (!_webPaymentCoordinatorProxy) {
@@ -251,6 +264,7 @@
_didSelectShippingContactCompletion = completion;
_webPaymentCoordinatorProxy->didSelectShippingContact(WebCore::PaymentContact(contact));
}
+
#endif
- (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
