Title: [243077] tags/Safari-608.1.9.1/Source
- Revision
- 243077
- Author
- [email protected]
- Date
- 2019-03-18 10:13:14 -0700 (Mon, 18 Mar 2019)
Log Message
Cherry-pick r242904. rdar://problem/48931041
Try to fix the Mac build after r242356.
Source/WebKit:
* Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest):
Source/WTF:
* wtf/FeatureDefines.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242904 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-608.1.9.1/Source/WTF/wtf/FeatureDefines.h (243076 => 243077)
--- tags/Safari-608.1.9.1/Source/WTF/wtf/FeatureDefines.h 2019-03-18 17:09:07 UTC (rev 243076)
+++ tags/Safari-608.1.9.1/Source/WTF/wtf/FeatureDefines.h 2019-03-18 17:13:14 UTC (rev 243077)
@@ -189,6 +189,10 @@
#define HAVE_PASSKIT_GRANULAR_ERRORS 1
#endif
+#if !defined(HAVE_PASSKIT_API_TYPE)
+#define HAVE_PASSKIT_API_TYPE 1
+#endif
+
#endif /* PLATFORM(IOS_FAMILY) */
/* --------- Apple WATCHOS port --------- */
@@ -279,6 +283,10 @@
#define HAVE_PASSKIT_GRANULAR_ERRORS __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
#endif
+#if !defined(HAVE_PASSKIT_API_TYPE)
+#define HAVE_PASSKIT_API_TYPE HAVE(PASSKIT_GRANULAR_ERRORS) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304
+#endif
+
#endif /* PLATFORM(MAC) */
#if PLATFORM(COCOA)
Modified: tags/Safari-608.1.9.1/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (243076 => 243077)
--- tags/Safari-608.1.9.1/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2019-03-18 17:09:07 UTC (rev 243076)
+++ tags/Safari-608.1.9.1/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2019-03-18 17:13:14 UTC (rev 243077)
@@ -239,7 +239,9 @@
return WTFMove(mutableSet);
}
+#endif
+#if HAVE(PASSKIT_API_TYPE)
static PKPaymentRequestAPIType toAPIType(WebCore::ApplePaySessionPaymentRequest::Requester requester)
{
switch (requester) {
@@ -266,7 +268,7 @@
} else if (!linkIconURLs.isEmpty())
[result setThumbnailURL:linkIconURLs[0]];
-#if HAVE(PASSKIT_GRANULAR_ERRORS)
+#if HAVE(PASSKIT_API_TYPE)
[result setAPIType:toAPIType(paymentRequest.requester())];
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
