Changeset 223566 in webkit

Timestamp:

Oct 17, 2017 12:04:22 PM (7 years ago)

Author:

aestes@apple.com

Message:

Roll out r223447.

Broke the Sierra build.

Location:

trunk

Files:

• LayoutTests/http/tests/ssl/applepay/ApplePayError-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (modified) (2 diffs)
• LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (modified) (2 diffs)
• Source/WebCore/Modules/applepay/ApplePayError.idl (modified) (1 diff)
• Source/WebCore/Modules/applepay/ApplePayPaymentContact.h (modified) (1 diff)
• Source/WebCore/Modules/applepay/ApplePayPaymentContact.idl (modified) (1 diff)
• Source/WebCore/Modules/applepay/ApplePaySessionPaymentRequest.h (modified) (1 diff)
• Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm (modified) (3 diffs)
• Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (modified) (3 diffs)

trunk/LayoutTests/http/tests/ssl/applepay/ApplePayError-expected.txt

@@ -28 +28 @@
 
 SETUP: 
-PASS new ApplePayError('unknown', []) threw exception TypeError: Argument 2 ('contactField') to the ApplePayError constructor must be one of: "phoneNumber", "emailAddress", "name", "phoneticName", "postalAddress", "addressLines", "subLocality", "locality", "postalCode", "subAdministrativeArea", "administrativeArea", "country", "countryCode".
+PASS new ApplePayError('unknown', []) threw exception TypeError: Argument 2 ('contactField') to the ApplePayError constructor must be one of: "phoneNumber", "emailAddress", "name", "phoneticName", "postalAddress", "addressLines", "locality", "postalCode", "administrativeArea", "country", "countryCode".
 
 SETUP: 
-PASS new ApplePayError('unknown', '') threw exception TypeError: Argument 2 ('contactField') to the ApplePayError constructor must be one of: "phoneNumber", "emailAddress", "name", "phoneticName", "postalAddress", "addressLines", "subLocality", "locality", "postalCode", "subAdministrativeArea", "administrativeArea", "country", "countryCode".
+PASS new ApplePayError('unknown', '') threw exception TypeError: Argument 2 ('contactField') to the ApplePayError constructor must be one of: "phoneNumber", "emailAddress", "name", "phoneticName", "postalAddress", "addressLines", "locality", "postalCode", "administrativeArea", "country", "countryCode".
 
 SETUP: 

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

@@ -261 +261 @@
 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
 
@@ -325 +322 @@
 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
 

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

@@ -149 +149 @@
     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")
@@ -176 +175 @@
     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")

trunk/Source/WebCore/Modules/applepay/ApplePayError.idl

@@ -42 +42 @@
     "postalAddress",
     "addressLines",
-    "subLocality",
     "locality",
     "postalCode",
-    "subAdministrativeArea",
     "administrativeArea",
     "country",

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

@@ -42 +42 @@
     String phoneticFamilyName;
     std::optional<Vector<String>> addressLines;
-    String subLocality;
     String locality;
     String postalCode;
-    String subAdministrativeArea;
     String administrativeArea;
     String country;

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

@@ -35 +35 @@
     [Conditional=APPLE_PAY_SESSION_V3] DOMString phoneticFamilyName;
     sequence<DOMString> addressLines;
-    DOMString subLocality;
     DOMString locality;
     DOMString postalCode;
-    DOMString subAdministrativeArea;
     DOMString administrativeArea;
     DOMString country;

trunk/Source/WebCore/Modules/applepay/ApplePaySessionPaymentRequest.h

@@ -168 +168 @@
         PostalAddress,
         AddressLines,
-        SubLocality,
         Locality,
         PostalCode,
-        SubAdministrativeArea,
         AdministrativeArea,
         Country,

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

@@ -47 +47 @@
 SOFT_LINK_CLASS(PassKit, PKContact)
 
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-@interface CNPostalAddress ()
-@property (readonly, copy, NS_NONATOMIC_IOSONLY) NSString *subLocality;
-@property (readonly, copy, NS_NONATOMIC_IOSONLY) NSString *subAdministrativeArea;
-@end
-
-@interface CNMutablePostalAddress ()
-@property (copy, NS_NONATOMIC_IOSONLY) NSString *subLocality;
-@property (copy, NS_NONATOMIC_IOSONLY) NSString *subAdministrativeArea;
-@end
-#endif
-
 namespace WebCore {
-
-static NSString *subLocality(CNPostalAddress *address)
-{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-    if (![address respondsToSelector:@selector(subLocality)])
-        return nil;
-#endif
-    return address.subLocality;
-}
-
-static void setSubLocality(CNMutablePostalAddress *address, NSString *subLocality)
-{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-    if (![address respondsToSelector:@selector(setSubLocality:)])
-        return;
-#endif
-    address.subLocality = subLocality;
-}
-
-static NSString *subAdministrativeArea(CNPostalAddress *address)
-{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-    if (![address respondsToSelector:@selector(subAdministrativeArea)])
-        return nil;
-#endif
-    return address.subAdministrativeArea;
-}
-
-static void setSubAdministrativeArea(CNMutablePostalAddress *address, NSString *subAdministrativeArea)
-{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
-    if (![address respondsToSelector:@selector(setSubAdministrativeArea:)])
-        return;
-#endif
-    address.subAdministrativeArea = subAdministrativeArea;
-}
 
 static RetainPtr<PKContact> convert(unsigned version, const ApplePayPaymentContact& contact)
@@ -149 +101 @@
         [address setStreet:builder.toString()];
 
-        if (!contact.subLocality.isEmpty())
-            setSubLocality(address.get(), contact.subLocality);
         if (!contact.locality.isEmpty())
             [address setCity:contact.locality];
         if (!contact.postalCode.isEmpty())
             [address setPostalCode:contact.postalCode];
-        if (!contact.subAdministrativeArea.isEmpty())
-            setSubAdministrativeArea(address.get(), contact.subAdministrativeArea);
         if (!contact.administrativeArea.isEmpty())
             [address setState:contact.administrativeArea];
@@ -193 +141 @@
         result.addressLines = WTFMove(addressLines);
     }
-    result.subLocality = subLocality(postalAddress);
     result.locality = postalAddress.city;
     result.postalCode = postalAddress.postalCode;
-    result.subAdministrativeArea = subAdministrativeArea(postalAddress);
     result.administrativeArea = postalAddress.state;
     result.country = postalAddress.country;

trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

@@ -64 +64 @@
 SOFT_LINK_FRAMEWORK(Contacts)
 SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStreetKey, NSString *);
-SOFT_LINK_CONSTANT(Contacts, CNPostalAddressSubLocalityKey, NSString *);
 SOFT_LINK_CONSTANT(Contacts, CNPostalAddressCityKey, NSString *);
-SOFT_LINK_CONSTANT(Contacts, CNPostalAddressSubAdministrativeAreaKey, NSString *);
 SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStateKey, NSString *);
 SOFT_LINK_CONSTANT(Contacts, CNPostalAddressPostalCodeKey, NSString *);
@@ -659 +657 @@
             break;
 
-        case WebCore::PaymentError::ContactField::SubLocality:
-            pkContactField = getPKContactFieldPostalAddress();
-            postalAddressKey = getCNPostalAddressSubLocalityKey();
-            break;
-
         case WebCore::PaymentError::ContactField::Locality:
             pkContactField = getPKContactFieldPostalAddress();
@@ -672 +665 @@
             pkContactField = getPKContactFieldPostalAddress();
             postalAddressKey = getCNPostalAddressPostalCodeKey();
-            break;
-
-        case WebCore::PaymentError::ContactField::SubAdministrativeArea:
-            pkContactField = getPKContactFieldPostalAddress();
-            postalAddressKey = getCNPostalAddressSubAdministrativeAreaKey();
             break;