Diff
Modified: trunk/LayoutTests/ChangeLog (223220 => 223221)
--- trunk/LayoutTests/ChangeLog 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/LayoutTests/ChangeLog 2017-10-12 00:47:44 UTC (rev 223221)
@@ -1,5 +1,18 @@
2017-10-11 Ryan Haddad <[email protected]>
+ Unreviewed, rolling out r223215.
+
+ This change broke the Sierra build.
+
+ Reverted changeset:
+
+ "[Apple Pay] Add subLocality and subAdministrativeArea to
+ ApplePayPaymentContact"
+ https://bugs.webkit.org/show_bug.cgi?id=178191
+ https://trac.webkit.org/changeset/223215
+
+2017-10-11 Ryan Haddad <[email protected]>
+
Rebaseline fast/scrolling/adjust-scroll-offset-on-zoom.html for iOS.
Unreviewed test gardening.
Modified: trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (223220 => 223221)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt 2017-10-12 00:47:44 UTC (rev 223221)
@@ -260,9 +260,6 @@
SETUP: request = validRequest(); request.billingContact = { };
PASS new ApplePaySession(2, request) did not throw exception.
-SETUP: request = validRequest(); request.billingContact = { subLocality: '', subAdministrativeArea: '' };
-PASS new ApplePaySession(2, request) did not throw exception.
-
Testing PaymentRequest.requiredShippingContactFields
SETUP: request = validRequest(); request.requiredShippingContactFields = undefined;
@@ -324,9 +321,6 @@
SETUP: request = validRequest(); request.shippingContact = { };
PASS new ApplePaySession(2, request) did not throw exception.
-SETUP: request = validRequest(); request.shippingContact = { subLocality: '', subAdministrativeArea: '' };
-PASS new ApplePaySession(2, request) did not throw exception.
-
Testing PaymentRequest.shippingType
SETUP: request = validRequest(); request.shippingType = undefined;
Modified: trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (223220 => 223221)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html 2017-10-12 00:47:44 UTC (rev 223221)
@@ -148,7 +148,6 @@
logAndShouldNotThrow("request = validRequest(); request.billingContact = null;", "new ApplePaySession(2, request)")
logAndShouldNotThrow("request = validRequest(); request.billingContact = undefined;", "new ApplePaySession(2, request)")
logAndShouldNotThrow("request = validRequest(); request.billingContact = { };", "new ApplePaySession(2, request)")
- logAndShouldNotThrow("request = validRequest(); request.billingContact = { subLocality: '', subAdministrativeArea: '' };", "new ApplePaySession(2, request)")
debug("Testing PaymentRequest.requiredShippingContactFields")
debug("");
@@ -175,7 +174,6 @@
logAndShouldNotThrow("request = validRequest(); request.shippingContact = null;", "new ApplePaySession(2, request)")
logAndShouldNotThrow("request = validRequest(); request.shippingContact = undefined;", "new ApplePaySession(2, request)")
logAndShouldNotThrow("request = validRequest(); request.shippingContact = { };", "new ApplePaySession(2, request)")
- logAndShouldNotThrow("request = validRequest(); request.shippingContact = { subLocality: '', subAdministrativeArea: '' };", "new ApplePaySession(2, request)")
debug("Testing PaymentRequest.shippingType")
debug("");
Modified: trunk/Source/WebCore/ChangeLog (223220 => 223221)
--- trunk/Source/WebCore/ChangeLog 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/Source/WebCore/ChangeLog 2017-10-12 00:47:44 UTC (rev 223221)
@@ -1,3 +1,16 @@
+2017-10-11 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223215.
+
+ This change broke the Sierra build.
+
+ Reverted changeset:
+
+ "[Apple Pay] Add subLocality and subAdministrativeArea to
+ ApplePayPaymentContact"
+ https://bugs.webkit.org/show_bug.cgi?id=178191
+ https://trac.webkit.org/changeset/223215
+
2017-10-11 Chris Dumez <[email protected]>
XMLHttpRequest: do not sniff text/html, and do not sniff XML when responseType is set to "text"
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.h (223220 => 223221)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.h 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.h 2017-10-12 00:47:44 UTC (rev 223221)
@@ -41,10 +41,8 @@
String phoneticGivenName;
String phoneticFamilyName;
std::optional<Vector<String>> addressLines;
- String subLocality;
String locality;
String postalCode;
- String subAdministrativeArea;
String administrativeArea;
String country;
String countryCode;
Modified: trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl (223220 => 223221)
--- trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl 2017-10-12 00:47:44 UTC (rev 223221)
@@ -34,10 +34,8 @@
[Conditional=APPLE_PAY_SESSION_V3] DOMString phoneticGivenName;
[Conditional=APPLE_PAY_SESSION_V3] DOMString phoneticFamilyName;
sequence<DOMString> addressLines;
- DOMString subLocality;
DOMString locality;
DOMString postalCode;
- DOMString subAdministrativeArea;
DOMString administrativeArea;
DOMString country;
DOMString countryCode;
Modified: trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm (223220 => 223221)
--- trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2017-10-12 00:46:59 UTC (rev 223220)
+++ trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm 2017-10-12 00:47:44 UTC (rev 223221)
@@ -100,14 +100,10 @@
// FIXME: StringBuilder should hava a toNSString() function to avoid the extra String allocation.
[address setStreet:builder.toString()];
- if (!contact.subLocality.isEmpty())
- [address setSubLocality:contact.subLocality];
if (!contact.locality.isEmpty())
[address setCity:contact.locality];
if (!contact.postalCode.isEmpty())
[address setPostalCode:contact.postalCode];
- if (!contact.subAdministrativeArea.isEmpty())
- [address setSubAdministrativeArea:contact.subAdministrativeArea];
if (!contact.administrativeArea.isEmpty())
[address setState:contact.administrativeArea];
if (!contact.country.isEmpty())
@@ -144,10 +140,8 @@
String(postalAddress.street).split("\n", addressLines);
result.addressLines = WTFMove(addressLines);
}
- result.subLocality = postalAddress.subLocality;
result.locality = postalAddress.city;
result.postalCode = postalAddress.postalCode;
- result.subAdministrativeArea = postalAddress.subAdministrativeArea;
result.administrativeArea = postalAddress.state;
result.country = postalAddress.country;
result.countryCode = postalAddress.ISOCountryCode;
