Title: [217664] trunk/Source
- Revision
- 217664
- Author
- [email protected]
- Date
- 2017-06-01 10:59:33 -0700 (Thu, 01 Jun 2017)
Log Message
[Cocoa] Upstream support for JCB as a supported payment network
https://bugs.webkit.org/show_bug.cgi?id=172819
Reviewed by Tim Horton.
Source/WebCore:
* Modules/applepay/PaymentRequest.cpp:
(WebCore::PaymentRequest::isValidSupportedNetwork):
(WebCore::isAdditionalValidSupportedNetwork): Deleted.
Source/WebKit2:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(WebKit::toSupportedNetwork):
(WebKit::toAdditionalSupportedNetwork): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (217663 => 217664)
--- trunk/Source/WebCore/ChangeLog 2017-06-01 17:42:23 UTC (rev 217663)
+++ trunk/Source/WebCore/ChangeLog 2017-06-01 17:59:33 UTC (rev 217664)
@@ -1,3 +1,14 @@
+2017-06-01 Andy Estes <[email protected]>
+
+ [Cocoa] Upstream support for JCB as a supported payment network
+ https://bugs.webkit.org/show_bug.cgi?id=172819
+
+ Reviewed by Tim Horton.
+
+ * Modules/applepay/PaymentRequest.cpp:
+ (WebCore::PaymentRequest::isValidSupportedNetwork):
+ (WebCore::isAdditionalValidSupportedNetwork): Deleted.
+
2017-06-01 Chris Dumez <[email protected]>
Unreviewed, rolling out r217660.
Modified: trunk/Source/WebCore/Modules/applepay/PaymentRequest.cpp (217663 => 217664)
--- trunk/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2017-06-01 17:42:23 UTC (rev 217663)
+++ trunk/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2017-06-01 17:59:33 UTC (rev 217664)
@@ -41,15 +41,6 @@
{
}
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PaymentRequestAdditions.cpp>)
-#include <WebKitAdditions/PaymentRequestAdditions.cpp>
-#else
-static inline bool isAdditionalValidSupportedNetwork(unsigned, const String&)
-{
- return false;
-}
-#endif
-
bool PaymentRequest::isValidSupportedNetwork(unsigned version, const String& supportedNetwork)
{
if (supportedNetwork == "amex")
@@ -66,8 +57,10 @@
return true;
if (supportedNetwork == "visa")
return true;
+ if (version >= 2 && supportedNetwork == "jcb")
+ return true;
- return isAdditionalValidSupportedNetwork(version, supportedNetwork);
+ return false;
}
bool isFinalStateResult(const std::optional<PaymentAuthorizationResult>& result)
Modified: trunk/Source/WebKit2/ChangeLog (217663 => 217664)
--- trunk/Source/WebKit2/ChangeLog 2017-06-01 17:42:23 UTC (rev 217663)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-01 17:59:33 UTC (rev 217664)
@@ -1,3 +1,14 @@
+2017-06-01 Andy Estes <[email protected]>
+
+ [Cocoa] Upstream support for JCB as a supported payment network
+ https://bugs.webkit.org/show_bug.cgi?id=172819
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toSupportedNetwork):
+ (WebKit::toAdditionalSupportedNetwork): Deleted.
+
2017-05-31 Andy Estes <[email protected]>
[Cocoa] "administrativeArea" contact field maps to the wrong CNPostalAddress key when creating NSErrors
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (217663 => 217664)
--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-06-01 17:42:23 UTC (rev 217663)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-06-01 17:59:33 UTC (rev 217664)
@@ -53,6 +53,7 @@
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkChinaUnionPay, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkDiscover, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkInterac, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkJCB, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkMasterCard, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkPrivateLabel, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkVisa, NSString *);
@@ -416,15 +417,6 @@
return result;
}
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPaymentCoordinatorProxyCocoaAdditions.mm>)
-#import <WebKitAdditions/WebPaymentCoordinatorProxyCocoaAdditions.mm>
-#else
-static inline NSString *toAdditionalSupportedNetwork(const String&)
-{
- return nullptr;
-}
-#endif
-
static NSString *toSupportedNetwork(const String& supportedNetwork)
{
if (supportedNetwork == "amex")
@@ -435,6 +427,8 @@
return getPKPaymentNetworkDiscover();
if (supportedNetwork == "interac")
return getPKPaymentNetworkInterac();
+ if (supportedNetwork == "jcb")
+ return getPKPaymentNetworkJCB();
if (supportedNetwork == "masterCard")
return getPKPaymentNetworkMasterCard();
if (supportedNetwork == "privateLabel")
@@ -442,7 +436,7 @@
if (supportedNetwork == "visa")
return getPKPaymentNetworkVisa();
- return toAdditionalSupportedNetwork(supportedNetwork);
+ return nil;
}
static RetainPtr<NSArray> toSupportedNetworks(const Vector<String>& supportedNetworks)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
