<!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>[206393] 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/206393">206393</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-26 14:25:12 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206238">r206238</a>. rdar://problem/28450514</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="#branchessafari602branchSourceWebCoreModulesapplepayApplePaySessionh">branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayApplePaySessionidl">branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.idl</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentCoordinatorcpp">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentCoordinatorh">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentCoordinatorClienth">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderEmptyClientscpp">branches/safari-602-branch/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformspicocoaPassKitSPIh">branches/safari-602-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacChangeLog">branches/safari-602-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClienth">branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClientmm">branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm</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="#branchessafari602branchSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxyh">branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxymessagesin">branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm">branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatorcpp">branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatorh">branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatormessagesin">branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in</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 (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2016-09-26 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206238. rdar://problem/28450514
+
+ 2016-09-21 Anders Carlsson <andersca@apple.com>
+
+ support openPaymentSetup API on ApplePaySession object
+ https://bugs.webkit.org/show_bug.cgi?id=162357
+ rdar://problem/26776939
+
+ Reviewed by Tim Horton.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::ApplePaySession::openPaymentSetup):
+ Perform security checks and then call into the PaymentCoordiantor. In its completion handler, we resolve the promise.
+
+ * Modules/applepay/ApplePaySession.h:
+ Add new members.
+
+ * Modules/applepay/ApplePaySession.idl:
+ Add openPaymentSetup declaration.
+
+ * Modules/applepay/PaymentCoordinator.cpp:
+ (WebCore::PaymentCoordinator::openPaymentSetup):
+ Call through to the clients.
+
+ * Modules/applepay/PaymentCoordinator.h:
+ * Modules/applepay/PaymentCoordinatorClient.h:
+ Add new members.
+
+ * loader/EmptyClients.cpp:
+ Add new stub.
+
+ * platform/spi/cocoa/PassKitSPI.h:
+ Add SPI declaration.
+
+2016-09-26 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r206350. rdar://problem/28115680
</span><span class="cx">
</span><span class="cx"> 2016-09-23 Wenson Hsieh <wenson_hsieh@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 (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -762,6 +762,31 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ApplePaySession::openPaymentSetup(ScriptExecutionContext& scriptExecutionContext, const String& merchantIdentifier, DeferredWrapper&& promise, ExceptionCode& ec)
+{
+ auto& document = downcast<Document>(scriptExecutionContext);
+ DOMWindow& window = *document.domWindow();
+
+ String errorMessage;
+ if (!canCallApplePaySessionAPIs(document, errorMessage)) {
+ window.printErrorMessage(errorMessage);
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+
+ if (!ScriptController::processingUserGesture()) {
+ window.printErrorMessage("Must call ApplePaySession.openPaymemntSetup from a user gesture handler.");
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+
+ auto& paymentCoordinator = document.frame()->mainFrame().paymentCoordinator();
+
+ paymentCoordinator.openPaymentSetup(merchantIdentifier, document.domain(), [promise](bool result) mutable {
+ promise.resolve(result);
+ });
+}
+
</ins><span class="cx"> void ApplePaySession::begin(ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> auto& document = *downcast<Document>(scriptExecutionContext());
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayApplePaySessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> static bool supportsVersion(ScriptExecutionContext&, unsigned version, ExceptionCode&);
</span><span class="cx"> static bool canMakePayments(ScriptExecutionContext&, ExceptionCode&);
</span><span class="cx"> static void canMakePaymentsWithActiveCard(ScriptExecutionContext&, const String& merchantIdentifier, DeferredWrapper&&, ExceptionCode&);
</span><ins>+ static void openPaymentSetup(ScriptExecutionContext&, const String& merchantIdentifier, DeferredWrapper&&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void begin(ExceptionCode&);
</span><span class="cx"> void abort(ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayApplePaySessionidl"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.idl (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.idl 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.idl 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> [CallWith=ScriptExecutionContext, RaisesException] static boolean supportsVersion(unsigned long version);
</span><span class="cx"> [CallWith=ScriptExecutionContext, RaisesException] static boolean canMakePayments();
</span><span class="cx"> [CallWith=ScriptExecutionContext, RaisesException] static Promise canMakePaymentsWithActiveCard(DOMString merchantIdentifier);
</span><ins>+ [CallWith=ScriptExecutionContext, RaisesException] static Promise openPaymentSetup(DOMString merchantIdentifier);
</ins><span class="cx">
</span><span class="cx"> [RaisesException] void begin();
</span><span class="cx"> [RaisesException] void abort();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.cpp 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -60,6 +60,11 @@
</span><span class="cx"> m_client.canMakePaymentsWithActiveCard(merchantIdentifier, domainName, WTFMove(completionHandler));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PaymentCoordinator::openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler)
+{
+ m_client.openPaymentSetup(merchantIdentifier, domainName, WTFMove(completionHandler));
+}
+
</ins><span class="cx"> bool PaymentCoordinator::beginPaymentSession(ApplePaySession& paymentSession, const URL& originatingURL, const Vector<URL>& linkIconURLs, const PaymentRequest& paymentRequest)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_activeSession);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentCoordinatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinator.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> bool supportsVersion(unsigned version);
</span><span class="cx"> bool canMakePayments();
</span><span class="cx"> void canMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler);
</span><ins>+ void openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler);
</ins><span class="cx">
</span><span class="cx"> bool hasActiveSession() const { return m_activeSession; }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentCoordinatorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> virtual bool supportsVersion(unsigned version) = 0;
</span><span class="cx"> virtual bool canMakePayments() = 0;
</span><span class="cx"> virtual void canMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) = 0;
</span><ins>+ virtual void openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool showPaymentUI(const URL& originatingURL, const Vector<URL>& linkIconURLs, const PaymentRequest&) = 0;
</span><span class="cx"> virtual void completeMerchantValidation(const PaymentMerchantSession&) = 0;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/EmptyClients.cpp (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/EmptyClients.cpp 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/loader/EmptyClients.cpp 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> bool supportsVersion(unsigned) override { return false; }
</span><span class="cx"> bool canMakePayments() override { return false; }
</span><span class="cx"> void canMakePaymentsWithActiveCard(const String&, const String&, std::function<void (bool)> completionHandler) override { callOnMainThread([completionHandler] { completionHandler(false); }); }
</span><ins>+ void openPaymentSetup(const String&, const String&, std::function<void (bool)> completionHandler) override { callOnMainThread([completionHandler] { completionHandler(false); }); }
+
</ins><span class="cx"> bool showPaymentUI(const URL&, const Vector<URL>&, const PaymentRequest&) override { return false; }
</span><span class="cx"> void completeMerchantValidation(const PaymentMerchantSession&) override { }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformspicocoaPassKitSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebCore/platform/spi/cocoa/PassKitSPI.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -214,3 +214,11 @@
</span><span class="cx"> NS_ASSUME_NONNULL_END
</span><span class="cx">
</span><span class="cx"> #endif
</span><ins>+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PKPassLibrary ()
+- (void)openPaymentSetupForMerchantIdentifier:(NSString *)identifier domain:(NSString *)domain completion:(void(^)(BOOL success))completion;
+@end
+
+NS_ASSUME_NONNULL_END
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-26 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r206238. rdar://problem/28450514
+
+ 2016-09-21 Anders Carlsson <andersca@apple.com>
+
+ Support openPaymentSetup API on ApplePaySession object
+ https://bugs.webkit.org/show_bug.cgi?id=162357
+ rdar://problem/26776939
+
+ Reviewed by Tim Horton.
+
+ Add openPaymentSetup stub.
+
+ * WebCoreSupport/WebPaymentCoordinatorClient.h:
+ * WebCoreSupport/WebPaymentCoordinatorClient.mm:
+ (WebPaymentCoordinatorClient::openPaymentSetup):
+
</ins><span class="cx"> 2016-09-16 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206006. rdar://problem/27991573
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> bool supportsVersion(unsigned) override;
</span><span class="cx"> bool canMakePayments() override;
</span><span class="cx"> void canMakePaymentsWithActiveCard(const String&, const String&, std::function<void (bool)> completionHandler) override;
</span><ins>+ void openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) override;
</ins><span class="cx"> bool showPaymentUI(const WebCore::URL&, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&) override;
</span><span class="cx"> void completeMerchantValidation(const WebCore::PaymentMerchantSession&) override;
</span><span class="cx"> void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -55,6 +55,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPaymentCoordinatorClient::openPaymentSetup(const String&, const String&, std::function<void (bool)> completionHandler)
+{
+ callOnMainThread([completionHandler] {
+ completionHandler(false);
+ });
+}
+
</ins><span class="cx"> bool WebPaymentCoordinatorClient::showPaymentUI(const WebCore::URL&, const Vector<WebCore::URL>&, const WebCore::PaymentRequest&)
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2016-09-26 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206238. rdar://problem/28450514
+
+ 2016-09-21 Anders Carlsson <andersca@apple.com>
+
+ support openPaymentSetup API on ApplePaySession object
+ https://bugs.webkit.org/show_bug.cgi?id=162357
+ rdar://problem/26776939
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
+ (WebKit::WebPaymentCoordinatorProxy::openPaymentSetup):
+ Call through to platformOpenPaymentSetup, and in the completion handler, send back a OpenPaymentSetupReply message.
+
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.h:
+ Add new members.
+
+ * UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in:
+ Add OpenPaymentSetup message.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::WebPaymentCoordinatorProxy::platformOpenPaymentSetup):
+ Allocate a PKPassLibrary and call openPaymentSetupForMerchantIdentifier:domain:completion: on it.
+
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::generateOpenPaymentSetupReplyID):
+ New helper function to generate a reply ID.
+
+ (WebKit::WebPaymentCoordinator::openPaymentSetup):
+ Add the completion handler to m_pendingOpenPaymentSetupCallbacks and send a OpenPaymentSetup message to the UI process.
+
+ (WebKit::WebPaymentCoordinator::openPaymentSetupReply):
+ Grab the callback given its ID and invoke it.
+
+ * WebProcess/ApplePay/WebPaymentCoordinator.h:
+ Add new members.
+
+ * WebProcess/ApplePay/WebPaymentCoordinator.messages.in:
+ Add OpenPaymentSetupReply message.
+
+2016-09-26 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r206350. rdar://problem/28115680
</span><span class="cx">
</span><span class="cx"> 2016-09-23 Wenson Hsieh <wenson_hsieh@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 (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -72,6 +72,18 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPaymentCoordinatorProxy::openPaymentSetup(const String& merchantIdentifier, const String& domainName, uint64_t requestID)
+{
+ auto weakThis = m_weakPtrFactory.createWeakPtr();
+ platformOpenPaymentSetup(merchantIdentifier, domainName, [weakThis, requestID](bool result) {
+ auto paymentCoordinatorProxy = weakThis.get();
+ if (!paymentCoordinatorProxy)
+ return;
+
+ paymentCoordinatorProxy->m_webPageProxy.send(Messages::WebPaymentCoordinator::OpenPaymentSetupReply(requestID, result));
+ });
+}
+
</ins><span class="cx"> void WebPaymentCoordinatorProxy::showPaymentUI(const String& originatingURLString, const Vector<String>& linkIconURLStrings, const WebCore::PaymentRequest& paymentRequest, bool& result)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Make this a message check.
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void canMakePayments(bool& reply);
</span><span class="cx"> void canMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, uint64_t requestID);
</span><ins>+ void openPaymentSetup(const String& merchantIdentifier, const String& domainName, uint64_t requestID);
</ins><span class="cx"> void showPaymentUI(const String& originatingURLString, const Vector<String>& linkIconURLStrings, const WebCore::PaymentRequest&, bool& result);
</span><span class="cx"> void completeMerchantValidation(const WebCore::PaymentMerchantSession&);
</span><span class="cx"> void completeShippingMethodSelection(uint32_t opaqueStatus, const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
</span><span class="lines">@@ -94,6 +95,7 @@
</span><span class="cx">
</span><span class="cx"> bool platformCanMakePayments();
</span><span class="cx"> void platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler);
</span><ins>+ void platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler);
</ins><span class="cx"> void platformShowPaymentUI(const WebCore::URL& originatingURL, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&, std::function<void (bool)> completionHandler);
</span><span class="cx"> void platformCompleteMerchantValidation(const WebCore::PaymentMerchantSession&);
</span><span class="cx"> void platformCompleteShippingMethodSelection(WebCore::PaymentAuthorizationStatus, const Optional<WebCore::PaymentRequest::TotalAndLineItems>&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePayWebPaymentCoordinatorProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> CanMakePayments() -> (bool result)
</span><span class="cx"> CanMakePaymentsWithActiveCard(String merchantIdentifier, String domainName, uint64_t requestID)
</span><ins>+ OpenPaymentSetup(String merchantIdentifier, String domainName, uint64_t requestID)
</ins><span class="cx">
</span><span class="cx"> ShowPaymentUI(String originatingURLString, Vector<String> linkIconURLStrings, WebCore::PaymentRequest paymentRequest) -> (bool result)
</span><span class="cx"> CompleteMerchantValidation(WebCore::PaymentMerchantSession paymentMerchantSession);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> SOFT_LINK_FRAMEWORK(PassKit)
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+SOFT_LINK_CLASS(PassKit, PKPassLibrary);
</ins><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentAuthorizationViewController);
</span><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentMerchantSession);
</span><span class="cx"> SOFT_LINK_CLASS(PassKit, PKPaymentRequest);
</span><span class="lines">@@ -222,6 +223,23 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPaymentCoordinatorProxy::platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler)
+{
+ auto passLibrary = adoptNS([allocPKPassLibraryInstance() init]);
+ if (![passLibrary respondsToSelector:@selector(openPaymentSetupForMerchantIdentifier:domain:completion:)]) {
+ RunLoop::main().dispatch([completionHandler] {
+ completionHandler(false);
+ });
+ return;
+ }
+
+ [passLibrary openPaymentSetupForMerchantIdentifier:merchantIdentifier domain:domainName completion:[completionHandler](BOOL result) {
+ RunLoop::main().dispatch([completionHandler, result] {
+ completionHandler(result);
+ });
+ }];
+}
+
</ins><span class="cx"> static PKAddressField toPKAddressField(const WebCore::PaymentRequest::ContactFields& contactFields)
</span><span class="cx"> {
</span><span class="cx"> PKAddressField result = 0;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -84,6 +84,21 @@
</span><span class="cx"> m_webPage.send(Messages::WebPaymentCoordinatorProxy::CanMakePaymentsWithActiveCard(merchantIdentifier, domainName, replyID));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static uint64_t generateOpenPaymentSetupReplyID()
+{
+ static uint64_t openPaymentSetupReplyID;
+
+ return ++openPaymentSetupReplyID;
+}
+
+void WebPaymentCoordinator::openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler)
+{
+ auto replyID = generateOpenPaymentSetupReplyID();
+
+ m_pendingOpenPaymentSetupCallbacks.add(replyID, WTFMove(completionHandler));
+ m_webPage.send(Messages::WebPaymentCoordinatorProxy::OpenPaymentSetup(merchantIdentifier, domainName, replyID));
+}
+
</ins><span class="cx"> bool WebPaymentCoordinator::showPaymentUI(const WebCore::URL& originatingURL, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest& paymentRequest)
</span><span class="cx"> {
</span><span class="cx"> Vector<String> linkIconURLStrings;
</span><span class="lines">@@ -168,6 +183,12 @@
</span><span class="cx"> callback(canMakePayments);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPaymentCoordinator::openPaymentSetupReply(uint64_t requestID, bool result)
+{
+ auto callback = m_pendingOpenPaymentSetupCallbacks.take(requestID);
+ callback(result);
+}
+
</ins><span class="cx"> WebCore::PaymentCoordinator& WebPaymentCoordinator::paymentCoordinator()
</span><span class="cx"> {
</span><span class="cx"> return m_webPage.mainFrame()->paymentCoordinator();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.h 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> bool supportsVersion(unsigned version) override;
</span><span class="cx"> bool canMakePayments() override;
</span><span class="cx"> void canMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) override;
</span><ins>+ void openPaymentSetup(const String& merchantIdentifier, const String& domainName, std::function<void (bool)> completionHandler) override;
</ins><span class="cx"> bool showPaymentUI(const WebCore::URL& originatingURL, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&) override;
</span><span class="cx"> void completeMerchantValidation(const WebCore::PaymentMerchantSession&) override;
</span><span class="cx"> void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> void didSelectPaymentMethod(const WebCore::PaymentMethod&);
</span><span class="cx"> void didCancelPayment();
</span><span class="cx"> void canMakePaymentsWithActiveCardReply(uint64_t requestID, bool canMakePayments);
</span><ins>+ void openPaymentSetupReply(uint64_t requestID, bool result);
</ins><span class="cx">
</span><span class="cx"> WebCore::PaymentCoordinator& paymentCoordinator();
</span><span class="cx">
</span><span class="lines">@@ -83,6 +85,7 @@
</span><span class="cx"> WebPage& m_webPage;
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, std::function<void (bool)>> m_pendingCanMakePaymentsWithActiveCardCallbacks;
</span><ins>+ HashMap<uint64_t, std::function<void (bool)>> m_pendingOpenPaymentSetupCallbacks;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatormessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in (206392 => 206393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in 2016-09-26 21:11:31 UTC (rev 206392)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.messages.in 2016-09-26 21:25:12 UTC (rev 206393)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> DidSelectPaymentMethod(WebCore::PaymentMethod paymentMethod)
</span><span class="cx"> DidCancelPayment()
</span><span class="cx"> CanMakePaymentsWithActiveCardReply(uint64_t requestID, bool canMakePayments)
</span><ins>+ OpenPaymentSetupReply(uint64_t requestID, bool result)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>