Title: [228359] branches/safari-605-branch/Source/WebCore
- Revision
- 228359
- Author
- jmarc...@apple.com
- Date
- 2018-02-09 21:43:52 -0800 (Fri, 09 Feb 2018)
Log Message
Cherry-pick r228342. rdar://problem/37408891
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228358 => 228359)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-10 05:43:50 UTC (rev 228358)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-10 05:43:52 UTC (rev 228359)
@@ -1,5 +1,29 @@
2018-02-09 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r228342. rdar://problem/37408891
+
+ 2018-02-09 Andy Estes <aes...@apple.com>
+
+ [Payment Request] Apple Pay sheet does not dismiss when calling complete() with result "unknown" or "fail"
+ https://bugs.webkit.org/show_bug.cgi?id=182658
+ <rdar://problem/37293917>
+
+ Reviewed by Brady Eidson.
+
+ When PaymentResponse::complete() is called with a result of "unknown" or "fail", we should
+ treat this as a fatal error and dismiss the Apple Pay sheet. However, we were adding an
+ error with code "unknown" to the authorization result, which PassKit interprets as a
+ non-fatal error. Instead, we should not set any errors and just use a status code of
+ PaymentAuthorizationStatus::Failure, which PassKit interprets as a fatal error, dismissing
+ the sheet.
+
+ No test possible.
+
+ * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
+ (WebCore::ApplePayPaymentHandler::complete):
+
+2018-02-09 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r228331. rdar://problem/37408871
2018-02-09 Andy Estes <aes...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp (228358 => 228359)
--- branches/safari-605-branch/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2018-02-10 05:43:50 UTC (rev 228358)
+++ branches/safari-605-branch/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2018-02-10 05:43:52 UTC (rev 228359)
@@ -409,7 +409,6 @@
case PaymentComplete::Fail:
case PaymentComplete::Unknown:
authorizationResult.status = PaymentAuthorizationStatus::Failure;
- authorizationResult.errors.append({ PaymentError::Code::Unknown, { }, std::nullopt });
break;
case PaymentComplete::Success:
authorizationResult.status = PaymentAuthorizationStatus::Success;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
