Diff
Modified: branches/safari-604.1-branch/LayoutTests/ChangeLog (220276 => 220277)
--- branches/safari-604.1-branch/LayoutTests/ChangeLog 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/ChangeLog 2017-08-04 17:10:36 UTC (rev 220277)
@@ -1,3 +1,7 @@
+2017-08-04 Jason Marcell <jmarc...@apple.com>
+
+ Revert r219896. rdar://problem/33711000
+
2017-08-03 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220185. rdar://problem/33713528
Modified: branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (220276 => 220277)
--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt 2017-08-04 17:10:36 UTC (rev 220277)
@@ -76,9 +76,6 @@
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 (220276 => 220277)
--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html 2017-08-04 17:10:36 UTC (rev 220277)
@@ -72,7 +72,6 @@
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 (220276 => 220277)
--- branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html 2017-08-04 17:10:36 UTC (rev 220277)
@@ -15,7 +15,7 @@
return {
countryCode: 'US',
currencyCode: 'USD',
- supportedNetworks: ['visa', 'masterCard', 'carteBancaire'],
+ supportedNetworks: ['visa', 'masterCard'],
merchantCapabilities: ['supports3DS'],
total: { label: 'Your Label', amount: '10.00' },
}
Modified: branches/safari-604.1-branch/Source/WebCore/ChangeLog (220276 => 220277)
--- branches/safari-604.1-branch/Source/WebCore/ChangeLog 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/Source/WebCore/ChangeLog 2017-08-04 17:10:36 UTC (rev 220277)
@@ -1,3 +1,7 @@
+2017-08-04 Jason Marcell <jmarc...@apple.com>
+
+ Revert r219896. rdar://problem/33711000
+
2017-08-03 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220163. rdar://problem/33711018
Modified: branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp (220276 => 220277)
--- branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2017-08-04 17:10:36 UTC (rev 220277)
@@ -59,8 +59,6 @@
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 (220276 => 220277)
--- branches/safari-604.1-branch/Source/WebKit/ChangeLog 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/Source/WebKit/ChangeLog 2017-08-04 17:10:36 UTC (rev 220277)
@@ -1,3 +1,7 @@
+2017-08-04 Jason Marcell <jmarc...@apple.com>
+
+ Revert r219896. rdar://problem/33711000
+
2017-08-03 Jason Marcell <jmarc...@apple.com>
Cherry-pick r220185. rdar://problem/33713528
Modified: branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (220276 => 220277)
--- branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-08-04 16:45:28 UTC (rev 220276)
+++ branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-08-04 17:10:36 UTC (rev 220277)
@@ -51,7 +51,6 @@
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 *);
@@ -437,8 +436,6 @@
{
if (supportedNetwork == "amex")
return getPKPaymentNetworkAmex();
- if (supportedNetwork == "carteBancaire")
- return getPKPaymentNetworkCarteBancaire();
if (supportedNetwork == "chinaUnionPay")
return getPKPaymentNetworkChinaUnionPay();
if (supportedNetwork == "discover")
