Changeset 220254 in webkit

Timestamp:

Aug 3, 2017 11:38:20 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Cherry-pick r219896. rdar://problem/33711000

Location:

branches/safari-604.1-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (modified) (1 diff)
• LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/applepay/PaymentRequest.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (modified) (2 diffs)

branches/safari-604.1-branch/LayoutTests/ChangeLog

@@ +1 @@
+2017-08-03  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r219896. rdar://problem/33711000
+
+    2017-07-25  Andy Estes  <aestes@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  <jmarcell@apple.com>
 

branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt

@@ -77 +77 @@
 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.

branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html

@@ -73 +73 @@
     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)")

branches/safari-604.1-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySessionV3.html

@@ -16 +16 @@
           countryCode: 'US',
           currencyCode: 'USD',
-          supportedNetworks: ['visa', 'masterCard'],
+          supportedNetworks: ['visa', 'masterCard', 'carteBancaire'],
           merchantCapabilities: ['supports3DS'],
           total: { label: 'Your Label', amount: '10.00' },

branches/safari-604.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-03  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r219896. rdar://problem/33711000
+
+    2017-07-25  Andy Estes  <aestes@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  <jmarcell@apple.com>
 

branches/safari-604.1-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp

@@ -60 +60 @@
     if (version >= 2 && supportedNetwork == "jcb")
         return true;
+    if (version >= 3 && supportedNetwork == "carteBancaire")
+        return true;
 
     return false;

branches/safari-604.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-03  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r219896. rdar://problem/33711000
+
+    2017-07-25  Andy Estes  <aestes@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  <jmarcell@apple.com>
 

branches/safari-604.1-branch/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

@@ -52 +52 @@
 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 *);
@@ -437 +438 @@
     if (supportedNetwork == "amex")
         return getPKPaymentNetworkAmex();
+    if (supportedNetwork == "carteBancaire")
+        return getPKPaymentNetworkCarteBancaire();
     if (supportedNetwork == "chinaUnionPay")
         return getPKPaymentNetworkChinaUnionPay();