Title: [214228] tags/Safari-604.1.13/Source/WebKit2
Revision
214228
Author
jmarc...@apple.com
Date
2017-03-21 12:49:36 -0700 (Tue, 21 Mar 2017)

Log Message

Merge r214179. rdar://problem/31030944

Modified Paths

Diff

Modified: tags/Safari-604.1.13/Source/WebKit2/ChangeLog (214227 => 214228)


--- tags/Safari-604.1.13/Source/WebKit2/ChangeLog	2017-03-21 19:45:38 UTC (rev 214227)
+++ tags/Safari-604.1.13/Source/WebKit2/ChangeLog	2017-03-21 19:49:36 UTC (rev 214228)
@@ -1,3 +1,20 @@
+2017-03-21  Jason Marcell  <jmarc...@apple.com>
+
+        Merge r214179. rdar://problem/31030944
+
+    2017-03-20  Anders Carlsson  <ander...@apple.com>
+
+            Fix a paste-o in WebPaymentCoordinatorProxy::platformCompletePaymentSession
+            https://bugs.webkit.org/show_bug.cgi?id=169881
+            rdar://problem/31030944
+
+            Reviewed by Dan Bernstein.
+
+            Don't always pass PKPaymentAuthorizationStatusFailure to the completion handler.
+
+            * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+            (WebKit::WebPaymentCoordinatorProxy::platformCompletePaymentSession):
+
 2017-03-19  Brian Burg  <bb...@apple.com>
 
         [Cocoa] Web Automation: non-sticky virtual keys like 'left arrow' don't work properly

Modified: tags/Safari-604.1.13/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (214227 => 214228)


--- tags/Safari-604.1.13/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	2017-03-21 19:45:38 UTC (rev 214227)
+++ tags/Safari-604.1.13/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	2017-03-21 19:49:36 UTC (rev 214228)
@@ -631,7 +631,7 @@
     m_paymentAuthorizationViewControllerDelegate->_didReachFinalState = WebCore::isFinalStateStatus(status);
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
-    auto pkPaymentAuthorizationResult = adoptNS([allocPKPaymentAuthorizationResultInstance() initWithStatus:PKPaymentAuthorizationStatusFailure errors:result ? toNSErrors(result->errors).get() : @[ ]]);
+    auto pkPaymentAuthorizationResult = adoptNS([allocPKPaymentAuthorizationResultInstance() initWithStatus:toPKPaymentAuthorizationStatus(status) errors:result ? toNSErrors(result->errors).get() : @[ ]]);
     m_paymentAuthorizationViewControllerDelegate->_paymentAuthorizedCompletion(pkPaymentAuthorizationResult.get());
 #else
     m_paymentAuthorizationViewControllerDelegate->_paymentAuthorizedCompletion(toPKPaymentAuthorizationStatus(status));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to