<!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>[204590] 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/204590">204590</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-08-17 22:37:34 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204587">r204587</a>. rdar://problem/27807479</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="#branchessafari602branchSourceWebCoreModulesapplepayPaymentRequestcpp">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentRequesth">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentRequestValidatorcpp">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulesapplepayPaymentRequestValidatorh">branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2SharedCocoaWebCoreArgumentCodersCocoamm">branches/safari-602-branch/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2SharedWebCoreArgumentCodersh">branches/safari-602-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-08-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204587. rdar://problem/27807479
+
+ 2016-08-17 Anders Carlsson <andersca@apple.com>
+
+ Add support for additional networks
+ https://bugs.webkit.org/show_bug.cgi?id=160951
+ rdar://problem/27807479
+
+ Reviewed by Sam Weinig.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::createSupportedNetworks):
+ (WebCore::createPaymentRequest):
+ (WebCore::ApplePaySession::create):
+ * Modules/applepay/PaymentRequest.cpp:
+ (WebCore::isAdditionalValidSupportedNetwork):
+ (WebCore::PaymentRequest::isValidSupportedNetwork):
+ * Modules/applepay/PaymentRequest.h:
+ (WebCore::PaymentRequest::supportedNetworks):
+ (WebCore::PaymentRequest::setSupportedNetworks):
+ * Modules/applepay/PaymentRequestValidator.cpp:
+ (WebCore::PaymentRequestValidator::validateSupportedNetworks):
+ * Modules/applepay/PaymentRequestValidator.h:
+
</ins><span class="cx"> 2016-08-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204274. rdar://problem/27688892
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -313,9 +313,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::SupportedNetworks> createSupportedNetworks(DOMWindow& window, const ArrayValue& supportedNetworksArray)
</del><ins>+static Optional<Vector<String>> createSupportedNetworks(unsigned version, DOMWindow& window, const ArrayValue& supportedNetworksArray)
</ins><span class="cx"> {
</span><del>- PaymentRequest::SupportedNetworks result;
</del><ins>+ Vector<String> result;
</ins><span class="cx">
</span><span class="cx"> size_t supportedNetworksCount;
</span><span class="cx"> if (!supportedNetworksArray.length(supportedNetworksCount))
</span><span class="lines">@@ -326,25 +326,13 @@
</span><span class="cx"> if (!supportedNetworksArray.get(i, supportedNetwork))
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><del>- if (supportedNetwork == "amex")
- result.amex = true;
- else if (supportedNetwork == "chinaUnionPay")
- result.chinaUnionPay = true;
- else if (supportedNetwork == "discover")
- result.discover = true;
- else if (supportedNetwork == "interac")
- result.interac = true;
- else if (supportedNetwork == "masterCard")
- result.masterCard = true;
- else if (supportedNetwork == "privateLabel")
- result.privateLabel = true;
- else if (supportedNetwork == "visa")
- result.visa = true;
- else {
</del><ins>+ if (!PaymentRequest::isValidSupportedNetwork(version, supportedNetwork)) {
</ins><span class="cx"> auto message = makeString("\"" + supportedNetwork, "\" is not a valid payment network.");
</span><span class="cx"> window.printErrorMessage(message);
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><ins>+
+ result.append(WTFMove(supportedNetwork));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -482,7 +470,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest> createPaymentRequest(DOMWindow& window, const Dictionary& dictionary)
</del><ins>+static Optional<PaymentRequest> createPaymentRequest(unsigned version, DOMWindow& window, const Dictionary& dictionary)
</ins><span class="cx"> {
</span><span class="cx"> PaymentRequest paymentRequest;
</span><span class="cx">
</span><span class="lines">@@ -516,7 +504,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto supportedNetworksArray = dictionary.get<ArrayValue>("supportedNetworks")) {
</span><del>- auto supportedNetworks = createSupportedNetworks(window, *supportedNetworksArray);
</del><ins>+ auto supportedNetworks = createSupportedNetworks(version, window, *supportedNetworksArray);
</ins><span class="cx"> if (!supportedNetworks)
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><span class="lines">@@ -672,7 +660,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto paymentRequest = createPaymentRequest(window, dictionary);
</del><ins>+ auto paymentRequest = createPaymentRequest(version, window, dictionary);
</ins><span class="cx"> if (!paymentRequest) {
</span><span class="cx"> ec = TYPE_MISMATCH_ERR;
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentRequestcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.cpp 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(APPLE_PAY)
</span><span class="cx">
</span><ins>+#include "SoftLinking.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PaymentRequest::PaymentRequest()
</span><span class="lines">@@ -38,6 +40,35 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/PaymentRequestAdditions.cpp>)
+#include <WebKitAdditions/PaymentRequestAdditions.cpp>
+#else
+static inline bool isAdditionalValidSupportedNetwork(unsigned, const String&)
+{
+ return false;
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+bool PaymentRequest::isValidSupportedNetwork(unsigned version, const String& supportedNetwork)
+{
+ if (supportedNetwork == "amex")
+ return true;
+ if (supportedNetwork == "chinaUnionPay")
+ return true;
+ if (supportedNetwork == "discover")
+ return true;
+ if (supportedNetwork == "interac")
+ return true;
+ if (supportedNetwork == "masterCard")
+ return true;
+ if (supportedNetwork == "privateLabel")
+ return true;
+ if (supportedNetwork == "visa")
+ return true;
+
+ return isAdditionalValidSupportedNetwork(version, supportedNetwork);
+}
+
+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.h (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.h 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequest.h 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -64,18 +64,10 @@
</span><span class="cx"> const PaymentContact& shippingContact() const { return m_shippingContact; }
</span><span class="cx"> void setShippingContact(const PaymentContact& shippingContact) { m_shippingContact = shippingContact; }
</span><span class="cx">
</span><del>- struct SupportedNetworks {
- bool amex { false };
- bool chinaUnionPay { false };
- bool discover { false };
- bool interac { false };
- bool masterCard { false };
- bool privateLabel { false };
- bool visa { false };
- };
</del><ins>+ static bool isValidSupportedNetwork(unsigned version, const String&);
</ins><span class="cx">
</span><del>- const SupportedNetworks& supportedNetworks() const { return m_supportedNetworks; }
- void setSupportedNetworks(const SupportedNetworks& supportedNetworks) { m_supportedNetworks = supportedNetworks; }
</del><ins>+ const Vector<String>& supportedNetworks() const { return m_supportedNetworks; }
+ void setSupportedNetworks(const Vector<String>& supportedNetworks) { m_supportedNetworks = supportedNetworks; }
</ins><span class="cx">
</span><span class="cx"> struct MerchantCapabilities {
</span><span class="cx"> bool supports3DS { false };
</span><span class="lines">@@ -143,7 +135,7 @@
</span><span class="cx"> ContactFields m_requiredShippingContactFields;
</span><span class="cx"> PaymentContact m_shippingContact;
</span><span class="cx">
</span><del>- SupportedNetworks m_supportedNetworks;
</del><ins>+ Vector<String> m_supportedNetworks;
</ins><span class="cx"> MerchantCapabilities m_merchantCapabilities;
</span><span class="cx">
</span><span class="cx"> ShippingType m_shippingType { ShippingType::Shipping };
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentRequestValidatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.cpp (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.cpp 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.cpp 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -147,9 +147,9 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PaymentRequestValidator::validateSupportedNetworks(const PaymentRequest::SupportedNetworks& supportedNetworks) const
</del><ins>+bool PaymentRequestValidator::validateSupportedNetworks(const Vector<String>& supportedNetworks) const
</ins><span class="cx"> {
</span><del>- if (!supportedNetworks.amex && !supportedNetworks.chinaUnionPay && !supportedNetworks.discover && !supportedNetworks.interac && !supportedNetworks.masterCard && !supportedNetworks.privateLabel &&!supportedNetworks.visa) {
</del><ins>+ if (supportedNetworks.isEmpty()) {
</ins><span class="cx"> m_window.printErrorMessage("Missing supported networks");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulesapplepayPaymentRequestValidatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.h (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.h 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebCore/Modules/applepay/PaymentRequestValidator.h 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> bool validateCountryCode(const String&) const;
</span><span class="cx"> bool validateCurrencyCode(const String&) const;
</span><span class="cx"> bool validateMerchantCapabilities(const PaymentRequest::MerchantCapabilities&) const;
</span><del>- bool validateSupportedNetworks(const PaymentRequest::SupportedNetworks&) const;
</del><ins>+ bool validateSupportedNetworks(const Vector<String>&) const;
</ins><span class="cx">
</span><span class="cx"> bool validateShippingMethods(const Vector<PaymentRequest::ShippingMethod>&) const;
</span><span class="cx"> bool validateShippingMethod(const PaymentRequest::ShippingMethod&) const;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-08-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204587. rdar://problem/27807479
+
+ 2016-08-17 Anders Carlsson <andersca@apple.com>
+
+ Add support for additional networks
+ https://bugs.webkit.org/show_bug.cgi?id=160951
+ rdar://problem/27807479
+
+ Reviewed by Sam Weinig.
+
+ * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+ (IPC::ArgumentCoder<PaymentRequest>::decode):
+ (IPC::ArgumentCoder<PaymentRequest::SupportedNetworks>::encode): Deleted.
+ (IPC::ArgumentCoder<PaymentRequest::SupportedNetworks>::decode): Deleted.
+ * Shared/WebCoreArgumentCoders.h:
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toAdditionalSupportedNetwork):
+ (WebKit::toSupportedNetwork):
+ (WebKit::toSupportedNetworks):
+ * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+ (WebKit::WebPaymentCoordinator::supportsVersion):
+
</ins><span class="cx"> 2016-08-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204414. rdar://problem/27624095
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2SharedCocoaWebCoreArgumentCodersCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> request.setMerchantCapabilities(merchantCapabilities);
</span><span class="cx">
</span><del>- PaymentRequest::SupportedNetworks supportedNetworks;
</del><ins>+ Vector<String> supportedNetworks;
</ins><span class="cx"> if (!decoder.decode(supportedNetworks))
</span><span class="cx"> return false;
</span><span class="cx"> request.setSupportedNetworks(supportedNetworks);
</span><span class="lines">@@ -334,37 +334,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<PaymentRequest::SupportedNetworks>::encode(ArgumentEncoder& encoder, const PaymentRequest::SupportedNetworks& supportedNetworks)
-{
- encoder << supportedNetworks.amex;
- encoder << supportedNetworks.chinaUnionPay;
- encoder << supportedNetworks.discover;
- encoder << supportedNetworks.interac;
- encoder << supportedNetworks.masterCard;
- encoder << supportedNetworks.privateLabel;
- encoder << supportedNetworks.visa;
-}
-
-bool ArgumentCoder<PaymentRequest::SupportedNetworks>::decode(ArgumentDecoder& decoder, PaymentRequest::SupportedNetworks& supportedNetworks)
-{
- if (!decoder.decode(supportedNetworks.amex))
- return false;
- if (!decoder.decode(supportedNetworks.chinaUnionPay))
- return false;
- if (!decoder.decode(supportedNetworks.discover))
- return false;
- if (!decoder.decode(supportedNetworks.interac))
- return false;
- if (!decoder.decode(supportedNetworks.masterCard))
- return false;
- if (!decoder.decode(supportedNetworks.privateLabel))
- return false;
- if (!decoder.decode(supportedNetworks.visa))
- return false;
-
- return true;
-}
-
</del><span class="cx"> void ArgumentCoder<PaymentRequest::ShippingMethod>::encode(ArgumentEncoder& encoder, const PaymentRequest::ShippingMethod& shippingMethod)
</span><span class="cx"> {
</span><span class="cx"> encoder << shippingMethod.label;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -521,11 +521,6 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ShippingMethod&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<> struct ArgumentCoder<WebCore::PaymentRequest::SupportedNetworks> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::SupportedNetworks&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::SupportedNetworks&);
-};
-
</del><span class="cx"> template<> struct ArgumentCoder<WebCore::PaymentRequest::TotalAndLineItems> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::TotalAndLineItems&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::TotalAndLineItems&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -282,24 +282,43 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RetainPtr<NSArray> toSupportedNetworks(const WebCore::PaymentRequest::SupportedNetworks& supportedNetworks)
</del><ins>+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WebPaymentCoordinatorProxyCocoaAdditions.mm>)
+#import <WebKitAdditions/WebPaymentCoordinatorProxyCocoaAdditions.mm>
+#else
+static inline NSString *toAdditionalSupportedNetwork(const String&)
</ins><span class="cx"> {
</span><ins>+ return nullptr;
+}
+#endif
+
+static NSString *toSupportedNetwork(const String& supportedNetwork)
+{
+ if (supportedNetwork == "amex")
+ return getPKPaymentNetworkAmex();
+ if (supportedNetwork == "chinaUnionPay")
+ return getPKPaymentNetworkChinaUnionPay();
+ if (supportedNetwork == "discover")
+ return getPKPaymentNetworkDiscover();
+ if (supportedNetwork == "interac")
+ return getPKPaymentNetworkInterac();
+ if (supportedNetwork == "masterCard")
+ return getPKPaymentNetworkMasterCard();
+ if (supportedNetwork == "privateLabel")
+ return getPKPaymentNetworkPrivateLabel();
+ if (supportedNetwork == "visa")
+ return getPKPaymentNetworkVisa();
+
+ return toAdditionalSupportedNetwork(supportedNetwork);
+}
+
+static RetainPtr<NSArray> toSupportedNetworks(const Vector<String>& supportedNetworks)
+{
</ins><span class="cx"> auto result = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx">
</span><del>- if (supportedNetworks.amex)
- [result addObject:getPKPaymentNetworkAmex()];
- if (supportedNetworks.chinaUnionPay)
- [result addObject:getPKPaymentNetworkChinaUnionPay()];
- if (supportedNetworks.discover)
- [result addObject:getPKPaymentNetworkDiscover()];
- if (supportedNetworks.interac)
- [result addObject:getPKPaymentNetworkInterac()];
- if (supportedNetworks.masterCard)
- [result addObject:getPKPaymentNetworkMasterCard()];
- if (supportedNetworks.privateLabel)
- [result addObject:getPKPaymentNetworkPrivateLabel()];
- if (supportedNetworks.visa)
- [result addObject:getPKPaymentNetworkVisa()];
</del><ins>+ for (auto& supportedNetwork : supportedNetworks) {
+ if (auto network = toSupportedNetwork(supportedNetwork))
+ [result addObject:network];
+ }
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessApplePayWebPaymentCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp (204589 => 204590)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-08-18 03:07:31 UTC (rev 204589)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/ApplePay/WebPaymentCoordinator.cpp 2016-08-18 05:37:34 UTC (rev 204590)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(version > 0);
</span><span class="cx">
</span><del>- if (version == 1)
</del><ins>+ if (version <= 2)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>