Title: [203881] branches/safari-602-branch/Source/WebCore
- Revision
- 203881
- Author
- bshaf...@apple.com
- Date
- 2016-07-29 00:12:12 -0700 (Fri, 29 Jul 2016)
Log Message
Merge r203746. rdar://problem/27527151
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203880 => 203881)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:09 UTC (rev 203880)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:12 UTC (rev 203881)
@@ -1,5 +1,22 @@
2016-07-28 Babak Shafiei <bshaf...@apple.com>
+ Merge r203746. rdar://problem/27527151
+
+ 2016-07-26 Anders Carlsson <ander...@apple.com>
+
+ onpaymentauthorized callback not received when authorizing for a second time
+ https://bugs.webkit.org/show_bug.cgi?id=160218
+ rdar://problem/27527151
+
+ Reviewed by Tim Horton.
+
+ Only null out the active session if the status is a final state status.
+
+ * Modules/applepay/PaymentCoordinator.cpp:
+ (WebCore::PaymentCoordinator::completePaymentSession):
+
+2016-07-28 Babak Shafiei <bshaf...@apple.com>
+
Merge r203737. rdar://problem/21090897
2016-07-26 Eric Carlson <eric.carl...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp (203880 => 203881)
--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-07-29 07:12:09 UTC (rev 203880)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-07-29 07:12:12 UTC (rev 203881)
@@ -29,6 +29,7 @@
#if ENABLE(APPLE_PAY)
#include "ApplePaySession.h"
+#include "PaymentAuthorizationStatus.h"
#include "PaymentCoordinatorClient.h"
#include "URL.h"
@@ -103,6 +104,10 @@
ASSERT(m_activeSession);
m_client.completePaymentSession(status);
+
+ if (!isFinalStateStatus(status))
+ return;
+
m_activeSession = nullptr;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
