Title: [215612] trunk/Source/WebCore
- Revision
- 215612
- Author
- [email protected]
- Date
- 2017-04-21 09:40:57 -0700 (Fri, 21 Apr 2017)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (215611 => 215612)
--- trunk/Source/WebCore/ChangeLog 2017-04-21 15:13:13 UTC (rev 215611)
+++ trunk/Source/WebCore/ChangeLog 2017-04-21 16:40:57 UTC (rev 215612)
@@ -1,3 +1,13 @@
+2017-04-21 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
Reduce copies and allocations in SharedBuffer::append
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (215611 => 215612)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-04-21 15:13:13 UTC (rev 215611)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2017-04-21 16:40:57 UTC (rev 215612)
@@ -828,36 +828,35 @@
{
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 };
}
if (errorCode)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
