<!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>[202644] trunk/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/202644">202644</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-29 13:14:30 -0700 (Wed, 29 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename addressFields to contactFields
https://bugs.webkit.org/show_bug.cgi?id=159271
rdar://problem/27086955
Reviewed by Beth Dakin.
Source/WebCore:
* Modules/applepay/ApplePaySession.cpp:
(WebCore::createContactFields):
(WebCore::isValidPaymentRequestPropertyName):
(WebCore::createPaymentRequest):
(WebCore::createAddressFields): Deleted.
* Modules/applepay/PaymentRequest.h:
(WebCore::PaymentRequest::requiredBillingContactFields):
(WebCore::PaymentRequest::setRequiredBillingContactFields):
(WebCore::PaymentRequest::requiredShippingContactFields):
(WebCore::PaymentRequest::setRequiredShippingContactFields):
(WebCore::PaymentRequest::requiredBillingAddressFields): Deleted.
(WebCore::PaymentRequest::setRequiredBillingAddressFields): Deleted.
(WebCore::PaymentRequest::requiredShippingAddressFields): Deleted.
(WebCore::PaymentRequest::setRequiredShippingAddressFields): Deleted.
Source/WebKit2:
* Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
(IPC::ArgumentCoder<PaymentRequest>::encode):
(IPC::ArgumentCoder<PaymentRequest>::decode):
(IPC::ArgumentCoder<PaymentRequest::ContactFields>::encode):
(IPC::ArgumentCoder<PaymentRequest::ContactFields>::decode):
(IPC::ArgumentCoder<PaymentRequest::AddressFields>::encode): Deleted.
(IPC::ArgumentCoder<PaymentRequest::AddressFields>::decode): Deleted.
* Shared/WebCoreArgumentCoders.h:
* UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
(WebKit::toPKAddressField):
(WebKit::toPKPaymentRequest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayApplePaySessioncpp">trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesapplepayPaymentRequesth">trunk/Source/WebCore/Modules/applepay/PaymentRequest.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWebCoreArgumentCodersCocoamm">trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-06-29 Anders Carlsson <andersca@apple.com>
+
+ Rename addressFields to contactFields
+ https://bugs.webkit.org/show_bug.cgi?id=159271
+ rdar://problem/27086955
+
+ Reviewed by Beth Dakin.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::createContactFields):
+ (WebCore::isValidPaymentRequestPropertyName):
+ (WebCore::createPaymentRequest):
+ (WebCore::createAddressFields): Deleted.
+ * Modules/applepay/PaymentRequest.h:
+ (WebCore::PaymentRequest::requiredBillingContactFields):
+ (WebCore::PaymentRequest::setRequiredBillingContactFields):
+ (WebCore::PaymentRequest::requiredShippingContactFields):
+ (WebCore::PaymentRequest::setRequiredShippingContactFields):
+ (WebCore::PaymentRequest::requiredBillingAddressFields): Deleted.
+ (WebCore::PaymentRequest::setRequiredBillingAddressFields): Deleted.
+ (WebCore::PaymentRequest::requiredShippingAddressFields): Deleted.
+ (WebCore::PaymentRequest::setRequiredShippingAddressFields): Deleted.
+
</ins><span class="cx"> 2016-06-29 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, third attempt to fix ASAN build for r202599
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayApplePaySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "LinkIconType.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><ins>+#include "PageConsoleClient.h"
</ins><span class="cx"> #include "PaymentAuthorizationStatus.h"
</span><span class="cx"> #include "PaymentContact.h"
</span><span class="cx"> #include "PaymentCoordinator.h"
</span><span class="lines">@@ -162,29 +163,29 @@
</span><span class="cx"> return amount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Optional<PaymentRequest::AddressFields> createAddressFields(DOMWindow& window, const ArrayValue& addressFieldsArray)
</del><ins>+static Optional<PaymentRequest::ContactFields> createContactFields(DOMWindow& window, const ArrayValue& contactFieldsArray)
</ins><span class="cx"> {
</span><del>- PaymentRequest::AddressFields result;
</del><ins>+ PaymentRequest::ContactFields result;
</ins><span class="cx">
</span><del>- size_t addressFieldsCount;
- if (!addressFieldsArray.length(addressFieldsCount))
</del><ins>+ size_t contactFieldsCount;
+ if (!contactFieldsArray.length(contactFieldsCount))
</ins><span class="cx"> return Nullopt;
</span><span class="cx">
</span><del>- for (size_t i = 0; i < addressFieldsCount; ++i) {
- String addressField;
- if (!addressFieldsArray.get(i, addressField))
</del><ins>+ for (size_t i = 0; i < contactFieldsCount; ++i) {
+ String contactField;
+ if (!contactFieldsArray.get(i, contactField))
</ins><span class="cx"> return Nullopt;
</span><span class="cx">
</span><del>- if (addressField == "postalAddress")
</del><ins>+ if (contactField == "postalAddress")
</ins><span class="cx"> result.postalAddress = true;
</span><del>- else if (addressField == "phone")
</del><ins>+ else if (contactField == "phone")
</ins><span class="cx"> result.phone = true;
</span><del>- else if (addressField == "email")
</del><ins>+ else if (contactField == "email")
</ins><span class="cx"> result.email = true;
</span><del>- else if (addressField == "name")
</del><ins>+ else if (contactField == "name")
</ins><span class="cx"> result.name = true;
</span><span class="cx"> else {
</span><del>- auto message = makeString("\"" + addressField, "\" is not a valid address field.");
</del><ins>+ auto message = makeString("\"" + contactField, "\" is not a valid contact field.");
</ins><span class="cx"> window.printErrorMessage(message);
</span><span class="cx"> return Nullopt;
</span><span class="cx"> }
</span><span class="lines">@@ -462,9 +463,9 @@
</span><span class="cx"> "supportedNetworks",
</span><span class="cx"> "countryCode",
</span><span class="cx"> "currencyCode",
</span><del>- "requiredBillingAddressFields",
</del><ins>+ "requiredBillingContactFields",
</ins><span class="cx"> "billingContact",
</span><del>- "requiredShippingAddressFields",
</del><ins>+ "requiredShippingContactFields",
</ins><span class="cx"> "shippingContact",
</span><span class="cx"> "shippingType",
</span><span class="cx"> "shippingMethods",
</span><span class="lines">@@ -471,6 +472,10 @@
</span><span class="cx"> "total",
</span><span class="cx"> "lineItems",
</span><span class="cx"> "applicationData",
</span><ins>+
+ // FIXME: Get rid of these.
+ "requiredBillingAddressFields",
+ "requiredShippingAddressFields",
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> for (auto& validPropertyName : validPropertyNames) {
</span><span class="lines">@@ -517,14 +522,24 @@
</span><span class="cx"> if (auto currencyCode = dictionary.get<String>("currencyCode"))
</span><span class="cx"> paymentRequest.setCurrencyCode(*currencyCode);
</span><span class="cx">
</span><del>- if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) {
- auto requiredBillingAddressFields = createAddressFields(window, *requiredBillingAddressFieldsArray);
</del><ins>+ if (auto requiredBillingContactFieldsArray = dictionary.get<ArrayValue>("requiredBillingContactFields")) {
+ auto requiredBillingContactFields = createContactFields(window, *requiredBillingContactFieldsArray);
+ if (!requiredBillingContactFields)
+ return Nullopt;
+
+ paymentRequest.setRequiredBillingContactFields(*requiredBillingContactFields);
+ } else if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) {
+ if (PageConsoleClient* pageConsole = window.console())
+ pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredShippingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredShippingContactFields\" instead.");
+
+ auto requiredBillingAddressFields = createContactFields(window, *requiredBillingAddressFieldsArray);
</ins><span class="cx"> if (!requiredBillingAddressFields)
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><del>- paymentRequest.setRequiredBillingAddressFields(*requiredBillingAddressFields);
</del><ins>+ paymentRequest.setRequiredBillingContactFields(*requiredBillingAddressFields);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if (auto billingContactValue = dictionary.get<JSC::JSValue>("billingContact")) {
</span><span class="cx"> String errorMessage;
</span><span class="cx"> auto billingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *billingContactValue, errorMessage);
</span><span class="lines">@@ -536,14 +551,24 @@
</span><span class="cx"> paymentRequest.setBillingContact(*billingContact);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto requiredShippingAddressFieldsArray = dictionary.get<ArrayValue>("requiredShippingAddressFields")) {
- auto requiredShippingAddressFields = createAddressFields(window, *requiredShippingAddressFieldsArray);
</del><ins>+ if (auto requiredShippingContactFieldsArray = dictionary.get<ArrayValue>("requiredShippingContactFields")) {
+ auto requiredShippingContactFields = createContactFields(window, *requiredShippingContactFieldsArray);
+ if (!requiredShippingContactFields)
+ return Nullopt;
+
+ paymentRequest.setRequiredShippingContactFields(*requiredShippingContactFields);
+ } else if (auto requiredShippingAddressFieldsArray = dictionary.get<ArrayValue>("requiredShippingAddressFields")) {
+ if (PageConsoleClient* pageConsole = window.console())
+ pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredShippingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredShippingContactFields\" instead.");
+
+ auto requiredShippingAddressFields = createContactFields(window, *requiredShippingAddressFieldsArray);
</ins><span class="cx"> if (!requiredShippingAddressFields)
</span><span class="cx"> return Nullopt;
</span><span class="cx">
</span><del>- paymentRequest.setRequiredShippingAddressFields(*requiredShippingAddressFields);
</del><ins>+ paymentRequest.setRequiredShippingContactFields(*requiredShippingAddressFields);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if (auto shippingContactValue = dictionary.get<JSC::JSValue>("shippingContact")) {
</span><span class="cx"> String errorMessage;
</span><span class="cx"> auto shippingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *shippingContactValue, errorMessage);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesapplepayPaymentRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/applepay/PaymentRequest.h (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebCore/Modules/applepay/PaymentRequest.h 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> const String& currencyCode() const { return m_currencyCode; }
</span><span class="cx"> void setCurrencyCode(const String& currencyCode) { m_currencyCode = currencyCode; }
</span><span class="cx">
</span><del>- struct AddressFields {
</del><ins>+ struct ContactFields {
</ins><span class="cx"> bool postalAddress { false };
</span><span class="cx"> bool phone { false };
</span><span class="cx"> bool email { false };
</span><span class="lines">@@ -52,14 +52,14 @@
</span><span class="cx"> bool name { false };
</span><span class="cx"> };
</span><span class="cx">
</span><del>- const AddressFields& requiredBillingAddressFields() const { return m_requiredBillingAddressFields; }
- void setRequiredBillingAddressFields(const AddressFields& requiredBillingAddressFields) { m_requiredBillingAddressFields = requiredBillingAddressFields; }
</del><ins>+ const ContactFields& requiredBillingContactFields() const { return m_requiredBillingContactFields; }
+ void setRequiredBillingContactFields(const ContactFields& requiredBillingContactFields) { m_requiredBillingContactFields = requiredBillingContactFields; }
</ins><span class="cx">
</span><span class="cx"> const PaymentContact& billingContact() const { return m_billingContact; }
</span><span class="cx"> void setBillingContact(const PaymentContact& billingContact) { m_billingContact = billingContact; }
</span><span class="cx">
</span><del>- const AddressFields& requiredShippingAddressFields() const { return m_requiredShippingAddressFields; }
- void setRequiredShippingAddressFields(const AddressFields& requiredShippingAddressFields) { m_requiredShippingAddressFields = requiredShippingAddressFields; }
</del><ins>+ const ContactFields& requiredShippingContactFields() const { return m_requiredShippingContactFields; }
+ void setRequiredShippingContactFields(const ContactFields& requiredShippingContactFields) { m_requiredShippingContactFields = requiredShippingContactFields; }
</ins><span class="cx">
</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="lines">@@ -137,10 +137,10 @@
</span><span class="cx"> String m_countryCode;
</span><span class="cx"> String m_currencyCode;
</span><span class="cx">
</span><del>- AddressFields m_requiredBillingAddressFields;
</del><ins>+ ContactFields m_requiredBillingContactFields;
</ins><span class="cx"> PaymentContact m_billingContact;
</span><span class="cx">
</span><del>- AddressFields m_requiredShippingAddressFields;
</del><ins>+ ContactFields m_requiredShippingContactFields;
</ins><span class="cx"> PaymentContact m_shippingContact;
</span><span class="cx">
</span><span class="cx"> SupportedNetworks m_supportedNetworks;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-29 Anders Carlsson <andersca@apple.com>
+
+ Rename addressFields to contactFields
+ https://bugs.webkit.org/show_bug.cgi?id=159271
+ rdar://problem/27086955
+
+ Reviewed by Beth Dakin.
+
+ * Shared/Cocoa/WebCoreArgumentCodersCocoa.mm:
+ (IPC::ArgumentCoder<PaymentRequest>::encode):
+ (IPC::ArgumentCoder<PaymentRequest>::decode):
+ (IPC::ArgumentCoder<PaymentRequest::ContactFields>::encode):
+ (IPC::ArgumentCoder<PaymentRequest::ContactFields>::decode):
+ (IPC::ArgumentCoder<PaymentRequest::AddressFields>::encode): Deleted.
+ (IPC::ArgumentCoder<PaymentRequest::AddressFields>::decode): Deleted.
+ * Shared/WebCoreArgumentCoders.h:
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toPKAddressField):
+ (WebKit::toPKPaymentRequest):
+
</ins><span class="cx"> 2016-06-29 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Adopt MediaRemote.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWebCoreArgumentCodersCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -188,9 +188,9 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << request.countryCode();
</span><span class="cx"> encoder << request.currencyCode();
</span><del>- encoder << request.requiredBillingAddressFields();
</del><ins>+ encoder << request.requiredBillingContactFields();
</ins><span class="cx"> encoder << request.billingContact();
</span><del>- encoder << request.requiredShippingAddressFields();
</del><ins>+ encoder << request.requiredShippingContactFields();
</ins><span class="cx"> encoder << request.shippingContact();
</span><span class="cx"> encoder << request.merchantCapabilities();
</span><span class="cx"> encoder << request.supportedNetworks();
</span><span class="lines">@@ -213,10 +213,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> request.setCurrencyCode(currencyCode);
</span><span class="cx">
</span><del>- PaymentRequest::AddressFields requiredBillingAddressFields;
- if (!decoder.decode((requiredBillingAddressFields)))
</del><ins>+ PaymentRequest::ContactFields requiredBillingContactFields;
+ if (!decoder.decode((requiredBillingContactFields)))
</ins><span class="cx"> return false;
</span><del>- request.setRequiredBillingAddressFields(requiredBillingAddressFields);
</del><ins>+ request.setRequiredBillingContactFields(requiredBillingContactFields);
</ins><span class="cx">
</span><span class="cx"> PaymentContact billingContact;
</span><span class="cx"> if (!decoder.decode(billingContact))
</span><span class="lines">@@ -223,10 +223,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> request.setBillingContact(billingContact);
</span><span class="cx">
</span><del>- PaymentRequest::AddressFields requiredShippingAddressFields;
- if (!decoder.decode((requiredShippingAddressFields)))
</del><ins>+ PaymentRequest::ContactFields requiredShippingContactFields;
+ if (!decoder.decode((requiredShippingContactFields)))
</ins><span class="cx"> return false;
</span><del>- request.setRequiredShippingAddressFields(requiredShippingAddressFields);
</del><ins>+ request.setRequiredShippingContactFields(requiredShippingContactFields);
</ins><span class="cx">
</span><span class="cx"> PaymentContact shippingContact;
</span><span class="cx"> if (!decoder.decode(shippingContact))
</span><span class="lines">@@ -271,23 +271,23 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<PaymentRequest::AddressFields>::encode(ArgumentEncoder& encoder, const PaymentRequest::AddressFields& addressFields)
</del><ins>+void ArgumentCoder<PaymentRequest::ContactFields>::encode(ArgumentEncoder& encoder, const PaymentRequest::ContactFields& contactFields)
</ins><span class="cx"> {
</span><del>- encoder << addressFields.postalAddress;
- encoder << addressFields.phone;
- encoder << addressFields.email;
- encoder << addressFields.name;
</del><ins>+ encoder << contactFields.postalAddress;
+ encoder << contactFields.phone;
+ encoder << contactFields.email;
+ encoder << contactFields.name;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<PaymentRequest::AddressFields>::decode(ArgumentDecoder& decoder, PaymentRequest::AddressFields& addressFields)
</del><ins>+bool ArgumentCoder<PaymentRequest::ContactFields>::decode(ArgumentDecoder& decoder, PaymentRequest::ContactFields& contactFields)
</ins><span class="cx"> {
</span><del>- if (!decoder.decode(addressFields.postalAddress))
</del><ins>+ if (!decoder.decode(contactFields.postalAddress))
</ins><span class="cx"> return false;
</span><del>- if (!decoder.decode(addressFields.phone))
</del><ins>+ if (!decoder.decode(contactFields.phone))
</ins><span class="cx"> return false;
</span><del>- if (!decoder.decode(addressFields.email))
</del><ins>+ if (!decoder.decode(contactFields.email))
</ins><span class="cx"> return false;
</span><del>- if (!decoder.decode(addressFields.name))
</del><ins>+ if (!decoder.decode(contactFields.name))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -501,9 +501,9 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::PaymentRequest&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template<> struct ArgumentCoder<WebCore::PaymentRequest::AddressFields> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::AddressFields&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::AddressFields&);
</del><ins>+template<> struct ArgumentCoder<WebCore::PaymentRequest::ContactFields> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::ContactFields&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ContactFields&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::PaymentRequest::LineItem> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplePaycocoaWebPaymentCoordinatorProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (202643 => 202644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-06-29 19:54:23 UTC (rev 202643)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2016-06-29 20:14:30 UTC (rev 202644)
</span><span class="lines">@@ -230,17 +230,17 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PKAddressField toPKAddressField(const WebCore::PaymentRequest::AddressFields& addressFields)
</del><ins>+static PKAddressField toPKAddressField(const WebCore::PaymentRequest::ContactFields& contactFields)
</ins><span class="cx"> {
</span><span class="cx"> PKAddressField result = 0;
</span><span class="cx">
</span><del>- if (addressFields.postalAddress)
</del><ins>+ if (contactFields.postalAddress)
</ins><span class="cx"> result |= PKAddressFieldPostalAddress;
</span><del>- if (addressFields.phone)
</del><ins>+ if (contactFields.phone)
</ins><span class="cx"> result |= PKAddressFieldPhone;
</span><del>- if (addressFields.email)
</del><ins>+ if (contactFields.email)
</ins><span class="cx"> result |= PKAddressFieldEmail;
</span><del>- if (addressFields.name)
</del><ins>+ if (contactFields.name)
</ins><span class="cx"> result |= PKAddressFieldName;
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -347,9 +347,9 @@
</span><span class="cx">
</span><span class="cx"> [result setCountryCode:paymentRequest.countryCode()];
</span><span class="cx"> [result setCurrencyCode:paymentRequest.currencyCode()];
</span><del>- [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingAddressFields())];
</del><ins>+ [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingContactFields())];
</ins><span class="cx"> [result setBillingContact:paymentRequest.billingContact().pkContact()];
</span><del>- [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingAddressFields())];
</del><ins>+ [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingContactFields())];
</ins><span class="cx"> [result setShippingContact:paymentRequest.shippingContact().pkContact()];
</span><span class="cx">
</span><span class="cx"> [result setSupportedNetworks:toSupportedNetworks(paymentRequest.supportedNetworks()).get()];
</span></span></pre>
</div>
</div>
</body>
</html>