Changeset 223221 in webkit


Ignore:
Timestamp:
Oct 11, 2017 5:47:44 PM (7 years ago)
Author:
Ryan Haddad
Message:

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

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r223218 r223221  
     12017-10-11  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r223215.
     4
     5        This change broke the Sierra build.
     6
     7        Reverted changeset:
     8
     9        "[Apple Pay] Add subLocality and subAdministrativeArea to
     10        ApplePayPaymentContact"
     11        https://bugs.webkit.org/show_bug.cgi?id=178191
     12        https://trac.webkit.org/changeset/223215
     13
    1142017-10-11  Ryan Haddad  <ryanhaddad@apple.com>
    215

  • trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt

    r223215 r223221  
    261261PASS new ApplePaySession(2, request) did not throw exception.
    262262
    263 SETUP: request = validRequest(); request.billingContact = { subLocality: '', subAdministrativeArea: '' };
    264 PASS new ApplePaySession(2, request) did not throw exception.
    265 
    266263Testing PaymentRequest.requiredShippingContactFields
    267264
    … …  
    325322PASS new ApplePaySession(2, request) did not throw exception.
    326323
    327 SETUP: request = validRequest(); request.shippingContact = { subLocality: '', subAdministrativeArea: '' };
    328 PASS new ApplePaySession(2, request) did not throw exception.
    329 
    330324Testing PaymentRequest.shippingType
    331325

  • trunk/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html

    r223215 r223221  
    149149    logAndShouldNotThrow("request = validRequest(); request.billingContact = undefined;", "new ApplePaySession(2, request)")
    150150    logAndShouldNotThrow("request = validRequest(); request.billingContact = { };", "new ApplePaySession(2, request)")
    151     logAndShouldNotThrow("request = validRequest(); request.billingContact = { subLocality: '', subAdministrativeArea: '' };", "new ApplePaySession(2, request)")
    152151   
    153152    debug("Testing PaymentRequest.requiredShippingContactFields")
    … …  
    176175    logAndShouldNotThrow("request = validRequest(); request.shippingContact = undefined;", "new ApplePaySession(2, request)")
    177176    logAndShouldNotThrow("request = validRequest(); request.shippingContact = { };", "new ApplePaySession(2, request)")
    178     logAndShouldNotThrow("request = validRequest(); request.shippingContact = { subLocality: '', subAdministrativeArea: '' };", "new ApplePaySession(2, request)")
    179177   
    180178    debug("Testing PaymentRequest.shippingType")

  • trunk/Source/WebCore/ChangeLog

    r223217 r223221  
     12017-10-11  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r223215.
     4
     5        This change broke the Sierra build.
     6
     7        Reverted changeset:
     8
     9        "[Apple Pay] Add subLocality and subAdministrativeArea to
     10        ApplePayPaymentContact"
     11        https://bugs.webkit.org/show_bug.cgi?id=178191
     12        https://trac.webkit.org/changeset/223215
     13
    1142017-10-11  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.h

    r223215 r223221  
    4242    String phoneticFamilyName;
    4343    std::optional<Vector<String>> addressLines;
    44     String subLocality;
    4544    String locality;
    4645    String postalCode;
    47     String subAdministrativeArea;
    4846    String administrativeArea;
    4947    String country;

  • trunk/Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl

    r223215 r223221  
    3535    [Conditional=APPLE_PAY_SESSION_V3] DOMString phoneticFamilyName;
    3636    sequence<DOMString> addressLines;
    37     DOMString subLocality;
    3837    DOMString locality;
    3938    DOMString postalCode;
    40     DOMString subAdministrativeArea;
    4139    DOMString administrativeArea;
    4240    DOMString country;

  • trunk/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm

    r223215 r223221  
    101101        [address setStreet:builder.toString()];
    102102
    103         if (!contact.subLocality.isEmpty())
    104             [address setSubLocality:contact.subLocality];
    105103        if (!contact.locality.isEmpty())
    106104            [address setCity:contact.locality];
    107105        if (!contact.postalCode.isEmpty())
    108106            [address setPostalCode:contact.postalCode];
    109         if (!contact.subAdministrativeArea.isEmpty())
    110             [address setSubAdministrativeArea:contact.subAdministrativeArea];
    111107        if (!contact.administrativeArea.isEmpty())
    112108            [address setState:contact.administrativeArea];
    … …  
    145141        result.addressLines = WTFMove(addressLines);
    146142    }
    147     result.subLocality = postalAddress.subLocality;
    148143    result.locality = postalAddress.city;
    149144    result.postalCode = postalAddress.postalCode;
    150     result.subAdministrativeArea = postalAddress.subAdministrativeArea;
    151145    result.administrativeArea = postalAddress.state;
    152146    result.country = postalAddress.country;
Note: See TracChangeset for help on using the changeset viewer.