<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203563] branches/safari-602-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203563">203563</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-22 02:25:25 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203414">r203414</a>. rdar://problem/26756701</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayApplePaySessioncpp">branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentAuthorizationStatush">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentAuthorizationStatus.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoah">branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm">branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203414. rdar://problem/26756701
+
+ 2016-07-19 Anders Carlsson <andersca@apple.com>
+
+ Some payment authorization status values should keep the sheet active
+ https://bugs.webkit.org/show_bug.cgi?id=159936
+ rdar://problem/26756701
+
+ Reviewed by Tim Horton.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::ApplePaySession::completePayment):
+ Keep the sheet active if the status isn't a final state status.
+
+ * Modules/applepay/PaymentAuthorizationStatus.h:
+ (WebCore::isFinalStateStatus):
+ Add a new helper function that returns whether a given payment authorization status is "final",
+ meaning that once that status has been passed to completePayment, the session is finished.
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203412. rdar://problem/26898984
</span><span class="cx">
</span><span class="cx"> 2016-07-19 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -1019,6 +1019,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> paymentCoordinator().completePaymentSession(*authorizationStatus);
</span><ins>+
+ if (!isFinalStateStatus(*authorizationStatus)) {
+ m_state = State::Active;
+ return;
+ }
+
</ins><span class="cx"> m_state = State::Completed;
</span><span class="cx"> unsetPendingActivity(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentAuthorizationStatush"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentAuthorizationStatus.h (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentAuthorizationStatus.h 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentAuthorizationStatus.h 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -40,6 +40,23 @@
</span><span class="cx"> PINLockout,
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+static inline bool isFinalStateStatus(PaymentAuthorizationStatus status)
+{
+ switch (status) {
+ case PaymentAuthorizationStatus::Success:
+ case PaymentAuthorizationStatus::Failure:
+ return true;
+
+ case PaymentAuthorizationStatus::InvalidBillingPostalAddress:
+ case PaymentAuthorizationStatus::InvalidShippingPostalAddress:
+ case PaymentAuthorizationStatus::InvalidShippingContact:
+ case PaymentAuthorizationStatus::PINRequired:
+ case PaymentAuthorizationStatus::PINIncorrect:
+ case PaymentAuthorizationStatus::PINLockout:
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203414. rdar://problem/26756701
+
+ 2016-07-19 Anders Carlsson <andersca@apple.com>
+
+ Some payment authorization status values should keep the sheet active
+ https://bugs.webkit.org/show_bug.cgi?id=159936
+ rdar://problem/26756701
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
+ (WebKit::WebPaymentCoordinatorProxy::completePaymentSession):
+ If the status isn't a final state status, bounce the current state back to active.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h:
+ Rename the _authorized ivar to _didReachFinalState.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewControllerDidFinish:]):
+ (WebKit::WebPaymentCoordinatorProxy::platformCompletePaymentSession):
+ Set _didReachFinalState based on the return value of isFinalStateStatus.
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203387. rdar://problem/27018065
</span><span class="cx">
</span><span class="cx"> 2016-07-18 Anders Carlsson <andersca@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -196,6 +196,11 @@
</span><span class="cx">
</span><span class="cx"> platformCompletePaymentSession(status);
</span><span class="cx">
</span><ins>+ if (!WebCore::isFinalStateStatus(status)) {
+ m_state = State::Active;
+ return;
+ }
+
</ins><span class="cx"> didReachFinalState();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoah"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> BlockPtr<void (PKPaymentMerchantSession *, NSError *)> _sessionBlock;
</span><span class="cx">
</span><del>- BOOL _authorized;
</del><ins>+ BOOL _didReachFinalState;
</ins><span class="cx"> BlockPtr<void (PKPaymentAuthorizationStatus)> _paymentAuthorizedCompletion;
</span><span class="cx"> BlockPtr<void (NSArray *)> _didSelectPaymentMethodCompletion;
</span><span class="cx"> BlockPtr<void (PKPaymentAuthorizationStatus, NSArray *)> _didSelectShippingMethodCompletion;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (203562 => 203563)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-07-22 09:25:21 UTC (rev 203562)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-07-22 09:25:25 UTC (rev 203563)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> if (!_webPaymentCoordinatorProxy)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!_authorized)
</del><ins>+ if (!_didReachFinalState)
</ins><span class="cx"> _webPaymentCoordinatorProxy->didCancelPayment();
</span><span class="cx">
</span><span class="cx"> _webPaymentCoordinatorProxy->hidePaymentUI();
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewController);
</span><span class="cx"> ASSERT(m_paymentAuthorizationViewControllerDelegate);
</span><span class="cx">
</span><del>- m_paymentAuthorizationViewControllerDelegate->_authorized = YES;
</del><ins>+ m_paymentAuthorizationViewControllerDelegate->_didReachFinalState = WebCore::isFinalStateStatus(status);
</ins><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_paymentAuthorizedCompletion(toPKPaymentAuthorizationStatus(status));
</span><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_paymentAuthorizedCompletion = nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>