Attachment 348802 Details for Bug 189254 – Patch

[patch] Patch

bug-189254-20180903202414.patch (text/plain), 10.00 KB, created by Andy Estes on 2018-09-03 20:24:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-09-03 20:24:18 PDT

Size: 10.00 KB

patch

obsolete

>Subversion Revision: 235604
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2abf4b92c03f2a19b561815c46776ea20542165b..6b60df13cdf7fd70883ab24cf7f3272416732012 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-09-03  Andy Estes  <aestes@apple.com>
>+
>+        [Payment Request] Remove PaymentAddress.languageCode
>+        https://bugs.webkit.org/show_bug.cgi?id=189254
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        PaymentAddress.languageCode is marked as "at risk" in the latest Payment Request Editor's
>+        Draft (30 August 2018). Firefox has already removed it, and Chrome is considering it.
>+
>+        There is some compatibility risk in removing this attribute, but considering we never
>+        populated it with a meaningful value, the risk seems very low. If we learn about
>+        compatibility problems, we can address them by evangelising or even reverting this change.
>+
>+        Updated existing tests.
>+
>+        * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
>+        (WebCore::convert):
>+        * Modules/paymentrequest/PaymentAddress.cpp:
>+        (WebCore::PaymentAddress::PaymentAddress):
>+        * Modules/paymentrequest/PaymentAddress.h:
>+        * Modules/paymentrequest/PaymentAddress.idl:
>+
> 2018-09-03  Andy Estes  <aestes@apple.com>
> 
>         [Payment Request] MerchantValidationEvent should be enabled by the PaymentRequest setting
>diff --git a/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp b/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
>index 08f404e18dc0d490d8ad3d28574aeb923ab783ef..98ba84712c111031a54c4eef3bcb2a05584ffa4c 100644
>--- a/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
>+++ b/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
>@@ -437,7 +437,7 @@ void ApplePayPaymentHandler::validateMerchant(const URL& validationURL)
> 
> static Ref<PaymentAddress> convert(const ApplePayPaymentContact& contact)
> {
>-    return PaymentAddress::create(contact.countryCode, contact.addressLines.value_or(Vector<String>()), contact.administrativeArea, contact.locality, contact.subLocality, contact.postalCode, String(), String(), String(), contact.localizedName, contact.phoneNumber);
>+    return PaymentAddress::create(contact.countryCode, contact.addressLines.value_or(Vector<String>()), contact.administrativeArea, contact.locality, contact.subLocality, contact.postalCode, String(), String(), contact.localizedName, contact.phoneNumber);
> }
> 
> void ApplePayPaymentHandler::didAuthorizePayment(const Payment& payment)
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentAddress.cpp b/Source/WebCore/Modules/paymentrequest/PaymentAddress.cpp
>index dbe6817b9ab87d9f6afc9c95c71a9ab92ed86209..0b5dc8c28bab196af6108330c0533d437df2f895 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentAddress.cpp
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentAddress.cpp
>@@ -30,7 +30,7 @@
> 
> namespace WebCore {
> 
>-PaymentAddress::PaymentAddress(const String& country, const Vector<String>& addressLine, const String& region, const String& city, const String& dependentLocality, const String& postalCode, const String& sortingCode, const String& languageCode, const String& organization, const String& recipient, const String& phone)
>+PaymentAddress::PaymentAddress(const String& country, const Vector<String>& addressLine, const String& region, const String& city, const String& dependentLocality, const String& postalCode, const String& sortingCode, const String& organization, const String& recipient, const String& phone)
>     : m_country { country }
>     , m_addressLine { addressLine }
>     , m_region { region }
>@@ -38,7 +38,6 @@ PaymentAddress::PaymentAddress(const String& country, const Vector<String>& addr
>     , m_dependentLocality { dependentLocality }
>     , m_postalCode { postalCode }
>     , m_sortingCode { sortingCode }
>-    , m_languageCode { languageCode }
>     , m_organization { organization }
>     , m_recipient { recipient }
>     , m_phone { phone }
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentAddress.h b/Source/WebCore/Modules/paymentrequest/PaymentAddress.h
>index c13e203fb9db6adda5f1df9ad281f651db6adb01..36abd9e9152aeaa379fdbdebc103f768bb83feaf 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentAddress.h
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentAddress.h
>@@ -47,13 +47,12 @@ public:
>     const String& dependentLocality() const { return m_dependentLocality; }
>     const String& postalCode() const { return m_postalCode; }
>     const String& sortingCode() const { return m_sortingCode; }
>-    const String& languageCode() const { return m_languageCode; }
>     const String& organization() const { return m_organization; }
>     const String& recipient() const { return m_recipient; }
>     const String& phone() const { return m_phone; }
> 
> private:
>-    PaymentAddress(const String& country, const Vector<String>& addressLine, const String& region, const String& city, const String& dependentLocality, const String& postalCode, const String& sortingCode, const String& languageCode, const String& organization, const String& recipient, const String& phone);
>+    PaymentAddress(const String& country, const Vector<String>& addressLine, const String& region, const String& city, const String& dependentLocality, const String& postalCode, const String& sortingCode, const String& organization, const String& recipient, const String& phone);
> 
>     String m_country;
>     Vector<String> m_addressLine;
>@@ -62,7 +61,6 @@ private:
>     String m_dependentLocality;
>     String m_postalCode;
>     String m_sortingCode;
>-    String m_languageCode;
>     String m_organization;
>     String m_recipient;
>     String m_phone;
>diff --git a/Source/WebCore/Modules/paymentrequest/PaymentAddress.idl b/Source/WebCore/Modules/paymentrequest/PaymentAddress.idl
>index e26b757d9347447f243f0aef3007158875617bab..7dc337f22adb166d901aac9f15783a785344d776 100644
>--- a/Source/WebCore/Modules/paymentrequest/PaymentAddress.idl
>+++ b/Source/WebCore/Modules/paymentrequest/PaymentAddress.idl
>@@ -38,7 +38,6 @@
>     readonly attribute DOMString dependentLocality;
>     readonly attribute DOMString postalCode;
>     readonly attribute DOMString sortingCode;
>-    readonly attribute DOMString languageCode;
>     readonly attribute DOMString organization;
>     readonly attribute DOMString recipient;
>     readonly attribute DOMString phone;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c7e999da9c11cb8c0fdbab91f1cbe0288bbe1b44..b166b565a9632f53ea3db4b21a433938f728e73b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-03  Andy Estes  <aestes@apple.com>
>+
>+        [Payment Request] Remove PaymentAddress.languageCode
>+        https://bugs.webkit.org/show_bug.cgi?id=189254
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html:
>+        * http/tests/ssl/applepay/ApplePayRequestShippingContact.https-expected.txt:
>+        * http/tests/ssl/applepay/ApplePayRequestShippingContact.https.html:
>+
> 2018-09-03  Youenn Fablet  <youenn@apple.com>
> 
>         REGRESSION: Layout Test http/tests/security/bypassing-cors-checks-for-extension-urls.html is Flaky
>diff --git a/LayoutTests/http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html b/LayoutTests/http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html
>index 0646caa1609774fd965ac0413e391f6937ce2a7a..6f8293ab94642e5c45ec62d3f8941dc5be5b4275 100644
>--- a/LayoutTests/http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html
>+++ b/LayoutTests/http/tests/paymentrequest/payment-address-attributes-and-toJSON-method.https.html
>@@ -83,7 +83,6 @@ function runTest(button, expected = {}) {
>         dependentLocality: '',
>         postalCode: address.postalCode,
>         sortingCode: '',
>-        languageCode: '',
>         organization: '',
>         recipient: address.localizedName,
>         phone: address.phoneNumber,
>diff --git a/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https-expected.txt b/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https-expected.txt
>index 6d15a44c84967c7b67360a4d3d26de910594de4d..2e87a3caa9d257f25eb9770616e4aec9f7bf7d0f 100644
>--- a/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https-expected.txt
>+++ b/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https-expected.txt
>@@ -26,7 +26,6 @@ PASS paymentResponse.shippingAddress.dependentLocality is expectedSubLocality
> PASS paymentResponse.shippingAddress.postalCode is expectedPostalCode
> PASS paymentResponse.shippingAddress.postalCode is expectedPostalCode
> PASS paymentResponse.shippingAddress.sortingCode is ''
>-PASS paymentResponse.shippingAddress.languageCode is ''
> PASS paymentResponse.shippingAddress.organization is ''
> PASS paymentResponse.shippingAddress.recipient is expectedName
> PASS paymentResponse.shippingAddress.phone is expectedPhoneNumber
>diff --git a/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https.html b/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https.html
>index 8b3fb243f19e8da6ea68e4da2146d8d8e0139a05..33e2089379c2822949094d349371ceb066b87557 100644
>--- a/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https.html
>+++ b/LayoutTests/http/tests/ssl/applepay/ApplePayRequestShippingContact.https.html
>@@ -114,7 +114,6 @@ async function runTests() {
>                 shouldBe("paymentResponse.shippingAddress.postalCode", "expectedPostalCode");
>                 shouldBe("paymentResponse.shippingAddress.postalCode", "expectedPostalCode");
>                 shouldBe("paymentResponse.shippingAddress.sortingCode", "''");
>-                shouldBe("paymentResponse.shippingAddress.languageCode", "''");
>                 shouldBe("paymentResponse.shippingAddress.organization", "''");
>                 shouldBe("paymentResponse.shippingAddress.recipient", "expectedName");
>                 shouldBe("paymentResponse.shippingAddress.phone", "expectedPhoneNumber");

Actions: View | Formatted Diff | Diff

Attachments on bug 189254: 348802