<!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>[213609] trunk/Source/WebKit2</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/213609">213609</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-03-08 16:43:31 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up WebPaymentCoordinatorProxy
https://bugs.webkit.org/show_bug.cgi?id=169393
Part of rdar://problem/28880714.
Reviewed by Beth Dakin.
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewControllerDidFinish:]):
Move this to where it belongs.
(WebKit::toPKPaymentSummaryItems):
Add a new helper function.
(WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingMethodSelection):
(WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingContactSelection):
Use the new helper function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm">trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213608 => 213609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-09 00:34:36 UTC (rev 213608)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-09 00:43:31 UTC (rev 213609)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-08 Anders Carlsson <andersca@apple.com>
+
+ Clean up WebPaymentCoordinatorProxy
+ https://bugs.webkit.org/show_bug.cgi?id=169393
+ Part of rdar://problem/28880714.
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (-[WKPaymentAuthorizationViewControllerDelegate paymentAuthorizationViewControllerDidFinish:]):
+ Move this to where it belongs.
+
+ (WebKit::toPKPaymentSummaryItems):
+ Add a new helper function.
+
+ (WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingMethodSelection):
+ (WebKit::WebPaymentCoordinatorProxy::platformCompleteShippingContactSelection):
+ Use the new helper function.
+
</ins><span class="cx"> 2017-03-08 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac][WK2] Whitelist a local cache needed by CFNetwork
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (213608 => 213609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-03-09 00:34:36 UTC (rev 213608)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2017-03-09 00:43:31 UTC (rev 213609)
</span><span class="lines">@@ -122,17 +122,6 @@
</span><span class="cx"> _webPaymentCoordinatorProxy->didAuthorizePayment(WebCore::Payment(payment));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller
-{
- if (!_webPaymentCoordinatorProxy)
- return;
-
- if (!_didReachFinalState)
- _webPaymentCoordinatorProxy->didCancelPayment();
-
- _webPaymentCoordinatorProxy->hidePaymentUI();
-}
-
</del><span class="cx"> static WebCore::PaymentRequest::ShippingMethod toShippingMethod(PKShippingMethod *shippingMethod)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(shippingMethod);
</span><span class="lines">@@ -183,6 +172,17 @@
</span><span class="cx"> _webPaymentCoordinatorProxy->didSelectPaymentMethod(WebCore::PaymentMethod(paymentMethod));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)paymentAuthorizationViewControllerDidFinish:(PKPaymentAuthorizationViewController *)controller
+{
+ if (!_webPaymentCoordinatorProxy)
+ return;
+
+ if (!_didReachFinalState)
+ _webPaymentCoordinatorProxy->didCancelPayment();
+
+ _webPaymentCoordinatorProxy->hidePaymentUI();
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> // FIXME: Once rdar://problem/24420024 has been fixed, import PKPaymentRequest_Private.h instead.
</span><span class="lines">@@ -274,6 +274,20 @@
</span><span class="cx"> return [getPKPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount.value_or(0)).get() type:toPKPaymentSummaryItemType(lineItem.type)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RetainPtr<NSArray> toPKPaymentSummaryItems(const WebCore::PaymentRequest::TotalAndLineItems& totalAndLineItems)
+{
+ auto paymentSummaryItems = adoptNS([[NSMutableArray alloc] init]);
+ for (auto& lineItem : totalAndLineItems.lineItems) {
+ if (auto summaryItem = toPKPaymentSummaryItem(lineItem))
+ [paymentSummaryItems addObject:summaryItem.get()];
+ }
+
+ if (auto totalItem = toPKPaymentSummaryItem(totalAndLineItems.total))
+ [paymentSummaryItems addObject:totalItem.get()];
+
+ return paymentSummaryItems;
+}
+
</ins><span class="cx"> static PKMerchantCapability toPKMerchantCapabilities(const WebCore::PaymentRequest::MerchantCapabilities& merchantCapabilities)
</span><span class="cx"> {
</span><span class="cx"> PKMerchantCapability result = 0;
</span><span class="lines">@@ -479,19 +493,9 @@
</span><span class="cx">
</span><span class="cx"> auto status = update ? update->status : WebCore::PaymentAuthorizationStatus::Success;
</span><span class="cx">
</span><del>- if (update) {
- auto paymentSummaryItems = adoptNS([[NSMutableArray alloc] init]);
- for (auto& lineItem : update->newTotalAndLineItems.lineItems) {
- if (auto summaryItem = toPKPaymentSummaryItem(lineItem))
- [paymentSummaryItems addObject:summaryItem.get()];
- }
</del><ins>+ if (update)
+ m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems = toPKPaymentSummaryItems(update->newTotalAndLineItems);
</ins><span class="cx">
</span><del>- if (auto totalItem = toPKPaymentSummaryItem(update->newTotalAndLineItems.total))
- [paymentSummaryItems addObject:totalItem.get()];
-
- m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems = WTFMove(paymentSummaryItems);
- }
-
</del><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_didSelectShippingMethodCompletion(toPKPaymentAuthorizationStatus(status), m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems.get());
</span><span class="cx"> m_paymentAuthorizationViewControllerDelegate->_didSelectShippingMethodCompletion = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -504,17 +508,8 @@
</span><span class="cx"> auto status = update ? update->status : WebCore::PaymentAuthorizationStatus::Success;
</span><span class="cx">
</span><span class="cx"> if (update) {
</span><del>- auto paymentSummaryItems = adoptNS([[NSMutableArray alloc] init]);
- for (auto& lineItem : update->newTotalAndLineItems.lineItems) {
- if (auto summaryItem = toPKPaymentSummaryItem(lineItem))
- [paymentSummaryItems addObject:summaryItem.get()];
- }
</del><ins>+ m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems = toPKPaymentSummaryItems(update->newTotalAndLineItems);
</ins><span class="cx">
</span><del>- if (auto totalItem = toPKPaymentSummaryItem(update->newTotalAndLineItems.total))
- [paymentSummaryItems addObject:totalItem.get()];
-
- m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems = WTFMove(paymentSummaryItems);
-
</del><span class="cx"> auto shippingMethods = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx"> for (auto& shippingMethod : update->newShippingMethods)
</span><span class="cx"> [shippingMethods addObject:toPKShippingMethod(shippingMethod).get()];
</span></span></pre>
</div>
</div>
</body>
</html>