Skip to site navigation (Press enter)

[webkit-changes] [216752] branches/safari-604.1.21-branch/Source

jmarcell Fri, 12 May 2017 00:54:03 -0700

Title: [216752] branches/safari-604.1.21-branch/Source

Revision: 216752
Author: jmarc...@apple.com
Date: 2017-05-12 00:52:50 -0700 (Fri, 12 May 2017)

Log Message

Cherry-pick r216691. rdar://problem/32136567


Modified Paths

branches/safari-604.1.21-branch/Source/WebCore/ChangeLog
branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/ApplePayError.idl
branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/PaymentRequest.h
branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog
branches/safari-604.1.21-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

Diff

Modified: branches/safari-604.1.21-branch/Source/WebCore/ChangeLog (216751 => 216752)


--- branches/safari-604.1.21-branch/Source/WebCore/ChangeLog	2017-05-12 07:52:47 UTC (rev 216751)
+++ branches/safari-604.1.21-branch/Source/WebCore/ChangeLog	2017-05-12 07:52:50 UTC (rev 216752)
@@ -1,5 +1,20 @@
 2017-05-11  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r216691. rdar://problem/32136567
+
+    2017-05-11  Andy Estes  <aes...@apple.com>
+
+            Fix a spelling mistake in ApplePayErrorCode
+            https://bugs.webkit.org/show_bug.cgi?id=171981
+            <rdar://problem/32136567>
+
+            Reviewed by Beth Dakin.
+
+            * Modules/applepay/ApplePayError.idl:
+            * Modules/applepay/PaymentRequest.h:
+
+2017-05-11  Jason Marcell  <jmarc...@apple.com>
+
         Cherry-pick r216650. rdar://problem/32111991
 
     2017-05-10  Eric Carlson  <eric.carl...@apple.com>

Modified: branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/ApplePayError.idl (216751 => 216752)


--- branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/ApplePayError.idl	2017-05-12 07:52:47 UTC (rev 216751)
+++ branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/ApplePayError.idl	2017-05-12 07:52:50 UTC (rev 216752)
@@ -29,7 +29,7 @@
     "unknown",
     "shippingContactInvalid",
     "billingContactInvalid",
-    "addressUnservicable"
+    "addressUnserviceable"
 };
 
 [

Modified: branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/PaymentRequest.h (216751 => 216752)


--- branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/PaymentRequest.h	2017-05-12 07:52:47 UTC (rev 216751)
+++ branches/safari-604.1.21-branch/Source/WebCore/Modules/applepay/PaymentRequest.h	2017-05-12 07:52:50 UTC (rev 216752)
@@ -155,7 +155,7 @@
         Unknown,
         ShippingContactInvalid,
         BillingContactInvalid,
-        AddressUnservicable,
+        AddressUnserviceable,
     };
 
     enum class ContactField {
@@ -207,7 +207,7 @@
         WebCore::PaymentError::Code::Unknown,
         WebCore::PaymentError::Code::ShippingContactInvalid,
         WebCore::PaymentError::Code::BillingContactInvalid,
-        WebCore::PaymentError::Code::AddressUnservicable
+        WebCore::PaymentError::Code::AddressUnserviceable
     >;
 };

Modified: branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog (216751 => 216752)


--- branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog	2017-05-12 07:52:47 UTC (rev 216751)
+++ branches/safari-604.1.21-branch/Source/WebKit2/ChangeLog	2017-05-12 07:52:50 UTC (rev 216752)
@@ -1,5 +1,21 @@
 2017-05-11  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r216691. rdar://problem/32136567
+
+    2017-05-11  Andy Estes  <aes...@apple.com>
+
+            Fix a spelling mistake in ApplePayErrorCode
+            https://bugs.webkit.org/show_bug.cgi?id=171981
+            <rdar://problem/32136567>
+
+            Reviewed by Beth Dakin.
+
+            * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+            (WebKit::toPKPaymentErrorCode):
+            (WebKit::toPKPaymentAuthorizationStatus):
+
+2017-05-11  Jason Marcell  <jmarc...@apple.com>
+
         Cherry-pick r216616. rdar://problem/32116375
 
     2017-05-10  Alex Christensen  <achristen...@webkit.org>

Modified: branches/safari-604.1.21-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (216751 => 216752)


--- branches/safari-604.1.21-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	2017-05-12 07:52:47 UTC (rev 216751)
+++ branches/safari-604.1.21-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	2017-05-12 07:52:50 UTC (rev 216752)
@@ -580,7 +580,7 @@
         return PKPaymentShippingContactInvalidError;
     case WebCore::PaymentError::Code::BillingContactInvalid:
         return PKPaymentBillingContactInvalidError;
-    case WebCore::PaymentError::Code::AddressUnservicable:
+    case WebCore::PaymentError::Code::AddressUnserviceable:
         return PKPaymentShippingAddressUnserviceableError;
     }
 }
@@ -666,7 +666,7 @@
         auto& error = result->errors[0];
         switch (error.code) {
         case WebCore::PaymentError::Code::Unknown:
-        case WebCore::PaymentError::Code::AddressUnservicable:
+        case WebCore::PaymentError::Code::AddressUnserviceable:
             return PKPaymentAuthorizationStatusFailure;
 
         case WebCore::PaymentError::Code::BillingContactInvalid:
@@ -750,7 +750,7 @@
         auto& error = update->errors[0];
         switch (error.code) {
         case WebCore::PaymentError::Code::Unknown:
-        case WebCore::PaymentError::Code::AddressUnservicable:
+        case WebCore::PaymentError::Code::AddressUnserviceable:
             return PKPaymentAuthorizationStatusFailure;
 
         case WebCore::PaymentError::Code::BillingContactInvalid:

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes