Bug 178191 – [Apple Pay] Add subLocality and subAdministrativeArea to ApplePayPaymentContact and ApplePayError

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Andy Estes]

[Apple Pay] Add subLocality and subAdministrativeArea to ApplePayPaymentContact

[Andy Estes]

rdar://problem/34906367

[Andy Estes]

Created attachment 323476 [details]
Patch

[Build Bot]

Comment on attachment 323476 [details]
Patch

Attachment 323476 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.webkit.org/results/4829570

New failing tests:
imported/w3c/web-platform-tests/XMLHttpRequest/open-url-worker-origin.htm

[Build Bot]

Created attachment 323493 [details]
Archive of layout-test-results from ews103 for mac-elcapitan

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: ews103  Port: mac-elcapitan  Platform: Mac OS X 10.11.6

[Andy Estes]

Committed r223215: <https://trac.webkit.org/changeset/223215>

[Ryan Haddad]

This change broke the Sierra build:

/Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm:104:22: error: instance method '-setSubLocality:' not found (return type defaults to 'id') [-Werror,-Wobjc-method-access]
/Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm:110:22: error: instance method '-setSubAdministrativeArea:' not found (return type defaults to 'id') [-Werror,-Wobjc-method-access]
/Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm:147:40: error: property 'subLocality' not found on object of type 'CNPostalAddress *'
/Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/applepay/cocoa/PaymentContactCocoa.mm:150:50: error: property 'subAdministrativeArea' not found on object of type 'CNPostalAddress *'

https://build.webkit.org/builders/Apple%20Sierra%20Release%20%2832-bit%20Build%29/builds/5699

[Ryan Haddad]

Reverted r223215 for reason:

This change broke the Sierra build.

Committed r223221: <https://trac.webkit.org/changeset/223221>

[Andy Estes]

(In reply to Ryan Haddad from comment #6)
> This change broke the Sierra build:
> 
> /Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/
> applepay/cocoa/PaymentContactCocoa.mm:104:22: error: instance method
> '-setSubLocality:' not found (return type defaults to 'id')
> [-Werror,-Wobjc-method-access]
> /Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/
> applepay/cocoa/PaymentContactCocoa.mm:110:22: error: instance method
> '-setSubAdministrativeArea:' not found (return type defaults to 'id')
> [-Werror,-Wobjc-method-access]
> /Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/
> applepay/cocoa/PaymentContactCocoa.mm:147:40: error: property 'subLocality'
> not found on object of type 'CNPostalAddress *'
> /Volumes/Data/slave/sierra-32bit-release/build/Source/WebCore/Modules/
> applepay/cocoa/PaymentContactCocoa.mm:150:50: error: property
> 'subAdministrativeArea' not found on object of type 'CNPostalAddress *'
> 
> https://build.webkit.org/builders/Apple%20Sierra%20Release%20%2832-
> bit%20Build%29/builds/5699

Huh, that builder is on 10.12.5 and these APIs are available in 10.12.4 and later. Maybe it's using an Xcode with an old SDK, though.

[Andy Estes]

Created attachment 323944 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 323944 [details]
Patch

Clearing flags on attachment: 323944

Committed r223447: <https://trac.webkit.org/changeset/223447>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Ryosuke Niwa]

Looks like this patch broke builds on macOS 10.12.6 due to re-declaration of APIs on CNPostalAddress and CNMutablePostalAddress.

As far as I can tell, the relevant API is defined post 10.12.4 but changing if-def to the following doesn't seem to help:
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101204

so I'm at loss here.

[Andy Estes]

(In reply to Ryosuke Niwa from comment #12)
> Looks like this patch broke builds on macOS 10.12.6 due to re-declaration of
> APIs on CNPostalAddress and CNMutablePostalAddress.
> 
> As far as I can tell, the relevant API is defined post 10.12.4 but changing
> if-def to the following doesn't seem to help:
> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101204
> 
> so I'm at loss here.

Reverted in r223566: <https://trac.webkit.org/changeset/223566/webkit>

[Andy Estes]

Committed r223580: <https://trac.webkit.org/changeset/223580>

[Andy Estes]

Fixed the Sierra build in r223583: <https://trac.webkit.org/changeset/223583>