Changeset 215612 in webkit

Timestamp:

Apr 21, 2017, 9:40:57 AM (9 years ago)

Author:

andersca@apple.com

Message:

Remove another use of toPaymentAuthorizationStatus
​https://bugs.webkit.org/show_bug.cgi?id=171114

Reviewed by Dan Bernstein.

• Modules/applepay/ApplePaySession.cpp:

(WebCore::ApplePaySession::completeShippingContactSelection):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/ApplePaySession.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-21  Anders Carlsson  <andersca@apple.com>
+
+        Remove another use of toPaymentAuthorizationStatus
+        https://bugs.webkit.org/show_bug.cgi?id=171114
+
+        Reviewed by Dan Bernstein.
+
+        * Modules/applepay/ApplePaySession.cpp:
+        (WebCore::ApplePaySession::completeShippingContactSelection):
+
 2017-04-21  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp

@@ -829 +829 @@
     ApplePayShippingContactUpdate update;
 
-    auto authorizationStatus = toPaymentAuthorizationStatus(status);
-    if (!authorizationStatus)
-        return Exception { INVALID_ACCESS_ERR };
-
     std::optional<ApplePayError::Code> errorCode;
     std::optional<ApplePayError::ContactField> contactField;
 
-    switch (*authorizationStatus) {
-    case PaymentAuthorizationStatus::Success:
+    switch (status) {
+    case ApplePaySession::STATUS_SUCCESS:
         break;
 
-    case PaymentAuthorizationStatus::Failure:
-    case PaymentAuthorizationStatus::PINRequired:
-    case PaymentAuthorizationStatus::PINIncorrect:
-    case PaymentAuthorizationStatus::PINLockout:
+    case ApplePaySession::STATUS_FAILURE:
+    case ApplePaySession::STATUS_PIN_REQUIRED:
+    case ApplePaySession::STATUS_PIN_INCORRECT:
+    case ApplePaySession::STATUS_PIN_LOCKOUT:
         errorCode = ApplePayError::Code::Unknown;
         break;
 
-    case PaymentAuthorizationStatus::InvalidBillingPostalAddress:
+    case ApplePaySession::STATUS_INVALID_BILLING_POSTAL_ADDRESS:
         errorCode = ApplePayError::Code::BillingContactInvalid;
         break;
 
-    case PaymentAuthorizationStatus::InvalidShippingPostalAddress:
+    case ApplePaySession::STATUS_INVALID_SHIPPING_POSTAL_ADDRESS:
         errorCode = ApplePayError::Code::ShippingContactInvalid;
         contactField = ApplePayError::ContactField::PostalAddress;
         break;
 
-    case PaymentAuthorizationStatus::InvalidShippingContact:
+    case ApplePaySession::STATUS_INVALID_SHIPPING_CONTACT:
         errorCode = ApplePayError::Code::ShippingContactInvalid;
         break;
+
+    default:
+        return Exception { INVALID_ACCESS_ERR };
     }