Changeset 215588 in webkit

Timestamp:

Apr 20, 2017, 4:49:34 PM (9 years ago)

Author:

andersca@apple.com

Message:

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

Reviewed by Tim Horton.

Just switch on the individual ApplePaySession::STATUS_ values.

• Modules/applepay/ApplePaySession.cpp:

(WebCore::ApplePaySession::completeShippingMethodSelection):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-20  Anders Carlsson  <andersca@apple.com>
+
+        Remove one use of toPaymentAuthorizationStatus
+        https://bugs.webkit.org/show_bug.cgi?id=171086
+
+        Reviewed by Tim Horton.
+
+        Just switch on the individual ApplePaySession::STATUS_ values.
+
+        * Modules/applepay/ApplePaySession.cpp:
+        (WebCore::ApplePaySession::completeShippingMethodSelection):
+
 2017-04-20  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -800 +800 @@
     ApplePayShippingMethodUpdate update;
 
-    auto authorizationStatus = toPaymentAuthorizationStatus(status);
-    if (!authorizationStatus)
-        return Exception { INVALID_ACCESS_ERR };
-
-    if (*authorizationStatus != PaymentAuthorizationStatus::Success) {
+    switch (status) {
+    case ApplePaySession::STATUS_SUCCESS:
+        break;
+    case ApplePaySession::STATUS_FAILURE:
+    case ApplePaySession::STATUS_INVALID_BILLING_POSTAL_ADDRESS:
+    case ApplePaySession::STATUS_INVALID_SHIPPING_POSTAL_ADDRESS:
+    case ApplePaySession::STATUS_INVALID_SHIPPING_CONTACT:
+    case ApplePaySession::STATUS_PIN_REQUIRED:
+    case ApplePaySession::STATUS_PIN_INCORRECT:
+    case ApplePaySession::STATUS_PIN_LOCKOUT:
         // This is a fatal error. Cancel the request.
         m_state = State::CancelRequested;
         paymentCoordinator().cancelPaymentSession();
         return { };
+
+    default:
+        return Exception { INVALID_ACCESS_ERR };
     }