Diff
Modified: trunk/Source/WebCore/ChangeLog (202643 => 202644)
--- 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)
@@ -1,3 +1,26 @@
+2016-06-29 Anders Carlsson <[email protected]>
+
+ 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.
+
2016-06-29 Jiewen Tan <[email protected]>
Unreviewed, third attempt to fix ASAN build for r202599
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (202643 => 202644)
--- 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)
@@ -45,6 +45,7 @@
#include "LinkIconType.h"
#include "MainFrame.h"
#include "Page.h"
+#include "PageConsoleClient.h"
#include "PaymentAuthorizationStatus.h"
#include "PaymentContact.h"
#include "PaymentCoordinator.h"
@@ -162,29 +163,29 @@
return amount;
}
-static Optional<PaymentRequest::AddressFields> createAddressFields(DOMWindow& window, const ArrayValue& addressFieldsArray)
+static Optional<PaymentRequest::ContactFields> createContactFields(DOMWindow& window, const ArrayValue& contactFieldsArray)
{
- PaymentRequest::AddressFields result;
+ PaymentRequest::ContactFields result;
- size_t addressFieldsCount;
- if (!addressFieldsArray.length(addressFieldsCount))
+ size_t contactFieldsCount;
+ if (!contactFieldsArray.length(contactFieldsCount))
return Nullopt;
- for (size_t i = 0; i < addressFieldsCount; ++i) {
- String addressField;
- if (!addressFieldsArray.get(i, addressField))
+ for (size_t i = 0; i < contactFieldsCount; ++i) {
+ String contactField;
+ if (!contactFieldsArray.get(i, contactField))
return Nullopt;
- if (addressField == "postalAddress")
+ if (contactField == "postalAddress")
result.postalAddress = true;
- else if (addressField == "phone")
+ else if (contactField == "phone")
result.phone = true;
- else if (addressField == "email")
+ else if (contactField == "email")
result.email = true;
- else if (addressField == "name")
+ else if (contactField == "name")
result.name = true;
else {
- auto message = makeString("\"" + addressField, "\" is not a valid address field.");
+ auto message = makeString("\"" + contactField, "\" is not a valid contact field.");
window.printErrorMessage(message);
return Nullopt;
}
@@ -462,9 +463,9 @@
"supportedNetworks",
"countryCode",
"currencyCode",
- "requiredBillingAddressFields",
+ "requiredBillingContactFields",
"billingContact",
- "requiredShippingAddressFields",
+ "requiredShippingContactFields",
"shippingContact",
"shippingType",
"shippingMethods",
@@ -471,6 +472,10 @@
"total",
"lineItems",
"applicationData",
+
+ // FIXME: Get rid of these.
+ "requiredBillingAddressFields",
+ "requiredShippingAddressFields",
};
for (auto& validPropertyName : validPropertyNames) {
@@ -517,14 +522,24 @@
if (auto currencyCode = dictionary.get<String>("currencyCode"))
paymentRequest.setCurrencyCode(*currencyCode);
- if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) {
- auto requiredBillingAddressFields = createAddressFields(window, *requiredBillingAddressFieldsArray);
+ 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);
if (!requiredBillingAddressFields)
return Nullopt;
- paymentRequest.setRequiredBillingAddressFields(*requiredBillingAddressFields);
+ paymentRequest.setRequiredBillingContactFields(*requiredBillingAddressFields);
}
+
if (auto billingContactValue = dictionary.get<JSC::JSValue>("billingContact")) {
String errorMessage;
auto billingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *billingContactValue, errorMessage);
@@ -536,14 +551,24 @@
paymentRequest.setBillingContact(*billingContact);
}
- if (auto requiredShippingAddressFieldsArray = dictionary.get<ArrayValue>("requiredShippingAddressFields")) {
- auto requiredShippingAddressFields = createAddressFields(window, *requiredShippingAddressFieldsArray);
+ 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);
if (!requiredShippingAddressFields)
return Nullopt;
- paymentRequest.setRequiredShippingAddressFields(*requiredShippingAddressFields);
+ paymentRequest.setRequiredShippingContactFields(*requiredShippingAddressFields);
}
+
if (auto shippingContactValue = dictionary.get<JSC::JSValue>("shippingContact")) {
String errorMessage;
auto shippingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *shippingContactValue, errorMessage);
Modified: trunk/Source/WebCore/Modules/applepay/PaymentRequest.h (202643 => 202644)
--- 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)
@@ -45,7 +45,7 @@
const String& currencyCode() const { return m_currencyCode; }
void setCurrencyCode(const String& currencyCode) { m_currencyCode = currencyCode; }
- struct AddressFields {
+ struct ContactFields {
bool postalAddress { false };
bool phone { false };
bool email { false };
@@ -52,14 +52,14 @@
bool name { false };
};
- const AddressFields& requiredBillingAddressFields() const { return m_requiredBillingAddressFields; }
- void setRequiredBillingAddressFields(const AddressFields& requiredBillingAddressFields) { m_requiredBillingAddressFields = requiredBillingAddressFields; }
+ const ContactFields& requiredBillingContactFields() const { return m_requiredBillingContactFields; }
+ void setRequiredBillingContactFields(const ContactFields& requiredBillingContactFields) { m_requiredBillingContactFields = requiredBillingContactFields; }
const PaymentContact& billingContact() const { return m_billingContact; }
void setBillingContact(const PaymentContact& billingContact) { m_billingContact = billingContact; }
- const AddressFields& requiredShippingAddressFields() const { return m_requiredShippingAddressFields; }
- void setRequiredShippingAddressFields(const AddressFields& requiredShippingAddressFields) { m_requiredShippingAddressFields = requiredShippingAddressFields; }
+ const ContactFields& requiredShippingContactFields() const { return m_requiredShippingContactFields; }
+ void setRequiredShippingContactFields(const ContactFields& requiredShippingContactFields) { m_requiredShippingContactFields = requiredShippingContactFields; }
const PaymentContact& shippingContact() const { return m_shippingContact; }
void setShippingContact(const PaymentContact& shippingContact) { m_shippingContact = shippingContact; }
@@ -137,10 +137,10 @@
String m_countryCode;
String m_currencyCode;
- AddressFields m_requiredBillingAddressFields;
+ ContactFields m_requiredBillingContactFields;
PaymentContact m_billingContact;
- AddressFields m_requiredShippingAddressFields;
+ ContactFields m_requiredShippingContactFields;
PaymentContact m_shippingContact;
SupportedNetworks m_supportedNetworks;
Modified: trunk/Source/WebKit2/ChangeLog (202643 => 202644)
--- 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)
@@ -1,3 +1,23 @@
+2016-06-29 Anders Carlsson <[email protected]>
+
+ 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):
+
2016-06-29 Jer Noble <[email protected]>
Adopt MediaRemote.
Modified: trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm (202643 => 202644)
--- 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)
@@ -188,9 +188,9 @@
{
encoder << request.countryCode();
encoder << request.currencyCode();
- encoder << request.requiredBillingAddressFields();
+ encoder << request.requiredBillingContactFields();
encoder << request.billingContact();
- encoder << request.requiredShippingAddressFields();
+ encoder << request.requiredShippingContactFields();
encoder << request.shippingContact();
encoder << request.merchantCapabilities();
encoder << request.supportedNetworks();
@@ -213,10 +213,10 @@
return false;
request.setCurrencyCode(currencyCode);
- PaymentRequest::AddressFields requiredBillingAddressFields;
- if (!decoder.decode((requiredBillingAddressFields)))
+ PaymentRequest::ContactFields requiredBillingContactFields;
+ if (!decoder.decode((requiredBillingContactFields)))
return false;
- request.setRequiredBillingAddressFields(requiredBillingAddressFields);
+ request.setRequiredBillingContactFields(requiredBillingContactFields);
PaymentContact billingContact;
if (!decoder.decode(billingContact))
@@ -223,10 +223,10 @@
return false;
request.setBillingContact(billingContact);
- PaymentRequest::AddressFields requiredShippingAddressFields;
- if (!decoder.decode((requiredShippingAddressFields)))
+ PaymentRequest::ContactFields requiredShippingContactFields;
+ if (!decoder.decode((requiredShippingContactFields)))
return false;
- request.setRequiredShippingAddressFields(requiredShippingAddressFields);
+ request.setRequiredShippingContactFields(requiredShippingContactFields);
PaymentContact shippingContact;
if (!decoder.decode(shippingContact))
@@ -271,23 +271,23 @@
return true;
}
-void ArgumentCoder<PaymentRequest::AddressFields>::encode(ArgumentEncoder& encoder, const PaymentRequest::AddressFields& addressFields)
+void ArgumentCoder<PaymentRequest::ContactFields>::encode(ArgumentEncoder& encoder, const PaymentRequest::ContactFields& contactFields)
{
- encoder << addressFields.postalAddress;
- encoder << addressFields.phone;
- encoder << addressFields.email;
- encoder << addressFields.name;
+ encoder << contactFields.postalAddress;
+ encoder << contactFields.phone;
+ encoder << contactFields.email;
+ encoder << contactFields.name;
}
-bool ArgumentCoder<PaymentRequest::AddressFields>::decode(ArgumentDecoder& decoder, PaymentRequest::AddressFields& addressFields)
+bool ArgumentCoder<PaymentRequest::ContactFields>::decode(ArgumentDecoder& decoder, PaymentRequest::ContactFields& contactFields)
{
- if (!decoder.decode(addressFields.postalAddress))
+ if (!decoder.decode(contactFields.postalAddress))
return false;
- if (!decoder.decode(addressFields.phone))
+ if (!decoder.decode(contactFields.phone))
return false;
- if (!decoder.decode(addressFields.email))
+ if (!decoder.decode(contactFields.email))
return false;
- if (!decoder.decode(addressFields.name))
+ if (!decoder.decode(contactFields.name))
return false;
return true;
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (202643 => 202644)
--- 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)
@@ -501,9 +501,9 @@
static bool decode(ArgumentDecoder&, WebCore::PaymentRequest&);
};
-template<> struct ArgumentCoder<WebCore::PaymentRequest::AddressFields> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::AddressFields&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::AddressFields&);
+template<> struct ArgumentCoder<WebCore::PaymentRequest::ContactFields> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::ContactFields&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ContactFields&);
};
template<> struct ArgumentCoder<WebCore::PaymentRequest::LineItem> {
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (202643 => 202644)
--- 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)
@@ -230,17 +230,17 @@
});
}
-static PKAddressField toPKAddressField(const WebCore::PaymentRequest::AddressFields& addressFields)
+static PKAddressField toPKAddressField(const WebCore::PaymentRequest::ContactFields& contactFields)
{
PKAddressField result = 0;
- if (addressFields.postalAddress)
+ if (contactFields.postalAddress)
result |= PKAddressFieldPostalAddress;
- if (addressFields.phone)
+ if (contactFields.phone)
result |= PKAddressFieldPhone;
- if (addressFields.email)
+ if (contactFields.email)
result |= PKAddressFieldEmail;
- if (addressFields.name)
+ if (contactFields.name)
result |= PKAddressFieldName;
return result;
@@ -347,9 +347,9 @@
[result setCountryCode:paymentRequest.countryCode()];
[result setCurrencyCode:paymentRequest.currencyCode()];
- [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingAddressFields())];
+ [result setRequiredBillingAddressFields:toPKAddressField(paymentRequest.requiredBillingContactFields())];
[result setBillingContact:paymentRequest.billingContact().pkContact()];
- [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingAddressFields())];
+ [result setRequiredShippingAddressFields:toPKAddressField(paymentRequest.requiredShippingContactFields())];
[result setShippingContact:paymentRequest.shippingContact().pkContact()];
[result setSupportedNetworks:toSupportedNetworks(paymentRequest.supportedNetworks()).get()];
