Title: [203789] trunk/Source/WebCore
- Revision
- 203789
- Author
- [email protected]
- Date
- 2016-07-27 13:52:50 -0700 (Wed, 27 Jul 2016)
Log Message
Stop accepting the deprecated "requiredShippingAddressFields" and "requiredBillingAddressFields" properties
https://bugs.webkit.org/show_bug.cgi?id=160264
rdar://problem/27574519
Reviewed by Simon Fraser.
* Modules/applepay/ApplePaySession.cpp:
(WebCore::createPaymentRequest):
(WebCore::isValidPaymentRequestPropertyName):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (203788 => 203789)
--- trunk/Source/WebCore/ChangeLog 2016-07-27 20:51:41 UTC (rev 203788)
+++ trunk/Source/WebCore/ChangeLog 2016-07-27 20:52:50 UTC (rev 203789)
@@ -1,3 +1,15 @@
+2016-07-27 Anders Carlsson <[email protected]>
+
+ Stop accepting the deprecated "requiredShippingAddressFields" and "requiredBillingAddressFields" properties
+ https://bugs.webkit.org/show_bug.cgi?id=160264
+ rdar://problem/27574519
+
+ Reviewed by Simon Fraser.
+
+ * Modules/applepay/ApplePaySession.cpp:
+ (WebCore::createPaymentRequest):
+ (WebCore::isValidPaymentRequestPropertyName):
+
2016-07-27 Chris Dumez <[email protected]>
First parameter to indexed property getters should be mandatory
Modified: trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp (203788 => 203789)
--- trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-07-27 20:51:41 UTC (rev 203788)
+++ trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp 2016-07-27 20:52:50 UTC (rev 203789)
@@ -472,10 +472,6 @@
"total",
"lineItems",
"applicationData",
-
- // FIXME: Get rid of these.
- "requiredBillingAddressFields",
- "requiredShippingAddressFields",
};
for (auto& validPropertyName : validPropertyNames) {
@@ -494,6 +490,16 @@
dictionary.getOwnPropertyNames(propertyNames);
for (auto& propertyName : propertyNames) {
+ if (propertyName == "requiredShippingAddressFields") {
+ window.printErrorMessage("\"requiredShippingAddressFields\" has been deprecated. Please switch to \"requiredShippingContactFields\" instead.");
+ return Nullopt;
+ }
+
+ if (propertyName == "requiredBillingAddressFields") {
+ window.printErrorMessage("\"requiredBillingAddressFields\" has been deprecated. Please switch to \"requiredBillingContactFields\" instead.");
+ return Nullopt;
+ }
+
if (!isValidPaymentRequestPropertyName(propertyName)) {
auto message = makeString("\"" + propertyName, "\" is not a valid payment request property name.");
window.printErrorMessage(message);
@@ -528,18 +534,8 @@
return Nullopt;
paymentRequest.setRequiredBillingContactFields(*requiredBillingContactFields);
- } else if (auto requiredBillingAddressFieldsArray = dictionary.get<ArrayValue>("requiredBillingAddressFields")) {
- if (PageConsoleClient* pageConsole = window.console())
- pageConsole->addMessage(MessageSource::JS, MessageLevel::Warning, "\"requiredBillingAddressFields\" has been deprecated and will stop working shortly. Please switch to \"requiredBillingContactFields\" instead.");
-
- auto requiredBillingAddressFields = createContactFields(window, *requiredBillingAddressFieldsArray);
- if (!requiredBillingAddressFields)
- return Nullopt;
-
- paymentRequest.setRequiredBillingContactFields(*requiredBillingAddressFields);
}
-
if (auto billingContactValue = dictionary.get<JSC::JSValue>("billingContact")) {
String errorMessage;
auto billingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *billingContactValue, errorMessage);
@@ -557,18 +553,8 @@
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.setRequiredShippingContactFields(*requiredShippingAddressFields);
}
-
if (auto shippingContactValue = dictionary.get<JSC::JSValue>("shippingContact")) {
String errorMessage;
auto shippingContact = PaymentContact::fromJS(*JSMainThreadExecState::currentState(), *shippingContactValue, errorMessage);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
