Diff
Modified: branches/safari-604.1-branch/LayoutTests/ChangeLog (220253 => 220254)
--- branches/safari-604.1-branch/LayoutTests/ChangeLog 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/ChangeLog 2017-08-04 06:38:20 UTC (rev 220254)
@@ -1,3 +1,19 @@
+2017-08-03 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219896. rdar://problem/33711000
+
+ 2017-07-25 Andy Estes <aes...@apple.com>
+
+ [Apple Pay] Add "carteBancaire" as a supported payment network
+ https://bugs.webkit.org/show_bug.cgi?id=174841
+ <rdar://problem/31935596>
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/ssl/applepay/ApplePaySession-expected.txt:
+ * http/tests/ssl/applepay/ApplePaySession.html:
+ * http/tests/ssl/applepay/ApplePaySessionV3.html:
+
2017-08-02 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220112. rdar://problem/33687415
Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (220253 => 220254)
--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt 2017-08-04 06:38:20 UTC (rev 220254)
@@ -76,6 +76,9 @@
SETUP: request = validRequest(); request.supportedNetworks = ['invalidNetwork', 'visa'];
PASS new ApplePaySession(2, request) threw exception TypeError: "invalidNetwork" is not a valid payment network..
+SETUP: request = validRequest(); request.supportedNetworks = ['carteBancaire'];
+PASS new ApplePaySession(2, request) threw exception TypeError: "carteBancaire" is not a valid payment network..
+
SETUP: request = validRequest(); request.supportedNetworks = ['visa', 'visa'];
PASS new ApplePaySession(2, request) did not throw exception.
Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (220253 => 220254)
--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html 2017-08-04 06:38:20 UTC (rev 220254)
@@ -72,6 +72,7 @@
logAndShouldThrow("request = validRequest(); request.supportedNetworks = [];", "new ApplePaySession(2, request)")
logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['invalidNetwork'];", "new ApplePaySession(2, request)")
logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['invalidNetwork', 'visa'];", "new ApplePaySession(2, request)")
+ logAndShouldThrow("request = validRequest(); request.supportedNetworks = ['carteBancaire'];", "new ApplePaySession(2, request)")
// FIXME: Should duplicate supportedNetworks be allowed?
logAndShouldNotThrow("request = validRequest(); request.supportedNetworks = ['visa', 'visa'];", "new ApplePaySession(2, request)")
Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html (220253 => 220254)
--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html 2017-08-04 06:38:20 UTC (rev 220254)
@@ -15,7 +15,7 @@
return {
countryCode: 'US',
currencyCode: 'USD',
- supportedNetworks: ['visa', 'masterCard'],
+ supportedNetworks: ['visa', 'masterCard', 'carteBancaire'],
merchantCapabilities: ['supports3DS'],
total: { label: 'Your Label', amount: '10.00' },
}
Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220253 => 220254)
--- branches/safari-604.1-branch/Source/WebCore/ChangeLog 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog 2017-08-04 06:38:20 UTC (rev 220254)
@@ -1,3 +1,21 @@
+2017-08-03 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219896. rdar://problem/33711000
+
+ 2017-07-25 Andy Estes <aes...@apple.com>
+
+ [Apple Pay] Add "carteBancaire" as a supported payment network
+ https://bugs.webkit.org/show_bug.cgi?id=174841
+ <rdar://problem/31935596>
+
+ Reviewed by Alex Christensen.
+
+ Tests: http/tests/ssl/applepay/ApplePaySession.html
+ http/tests/ssl/applepay/ApplePaySessionV3.html
+
+ * Modules/applepay/PaymentRequest.cpp:
+ (WebCore::PaymentRequest::isValidSupportedNetwork):
+
2017-08-02 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220112. rdar://problem/33687415
Modified: branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp (220253 => 220254)
--- branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2017-08-04 06:38:20 UTC (rev 220254)
@@ -59,6 +59,8 @@
return true;
if (version >= 2 && supportedNetwork == "jcb")
return true;
+ if (version >= 3 && supportedNetwork == "carteBancaire")
+ return true;
return false;
}
Modified: branches/safari-604.1-branch/Source/WebKit/ChangeLog (220253 => 220254)
--- branches/safari-604.1-branch/Source/WebKit/ChangeLog 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/Source/WebKit/ChangeLog 2017-08-04 06:38:20 UTC (rev 220254)
@@ -1,3 +1,18 @@
+2017-08-03 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r219896. rdar://problem/33711000
+
+ 2017-07-25 Andy Estes <aes...@apple.com>
+
+ [Apple Pay] Add "carteBancaire" as a supported payment network
+ https://bugs.webkit.org/show_bug.cgi?id=174841
+ <rdar://problem/31935596>
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toSupportedNetwork):
+
2017-07-31 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220033. rdar://problem/33619596
Modified: branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (220253 => 220254)
--- branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-08-04 06:13:23 UTC (rev 220253)
+++ branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-08-04 06:38:20 UTC (rev 220254)
@@ -51,6 +51,7 @@
SOFT_LINK_CLASS(PassKit, PKPaymentSummaryItem);
SOFT_LINK_CLASS(PassKit, PKShippingMethod);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkAmex, NSString *);
+SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkCarteBancaire, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkChinaUnionPay, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkDiscover, NSString *);
SOFT_LINK_CONSTANT(PassKit, PKPaymentNetworkInterac, NSString *);
@@ -436,6 +437,8 @@
{
if (supportedNetwork == "amex")
return getPKPaymentNetworkAmex();
+ if (supportedNetwork == "carteBancaire")
+ return getPKPaymentNetworkCarteBancaire();
if (supportedNetwork == "chinaUnionPay")
return getPKPaymentNetworkChinaUnionPay();
if (supportedNetwork == "discover")
