⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 269154 in webkit


Ignore:
Timestamp:
Oct 29, 2020, 10:47:26 AM (6 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r269109.

Introduced dependency cycle

Reverted changeset:

"[Cocoa] Remove soft linking of Contacts.framework"
​https://bugs.webkit.org/show_bug.cgi?id=218289
​https://trac.webkit.org/changeset/269109

Location:
trunk/Source/WebKit
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r269152 r269154  
     12020-10-29  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r269109.
     4
     5        Introduced dependency cycle
     6
     7        Reverted changeset:
     8
     9        "[Cocoa] Remove soft linking of Contacts.framework"
     10        https://bugs.webkit.org/show_bug.cgi?id=218289
     11        https://trac.webkit.org/changeset/269109
     12
    1132020-10-29  Per Arne Vollan  <pvollan@apple.com>
    214

  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r269109 r269154  
    5353WK_BACKBOARD_SERVICES_LDFLAGS_iphoneos = -framework BackBoardServices;
    5454WK_BACKBOARD_SERVICES_LDFLAGS_iphonesimulator = -framework BackBoardServices;
    55 
    56 WK_CONTACTS_LDFLAGS = $(WK_CONTACTS_LDFLAGS_$(WK_PLATFORM_NAME));
    57 WK_CONTACTS_LDFLAGS_iphoneos = -framework Contacts;
    58 WK_CONTACTS_LDFLAGS_iphonesimulator = -framework Contacts;
    59 WK_CONTACTS_LDFLAGS_macosx = -weak_framework Contacts;
    6055
    6156WK_RUNNINGBOARD_SERVICES_LDFLAGS = $(WK_RUNNINGBOARD_SERVICES_LDFLAGS_$(WK_COCOA_TOUCH));
    … …  
    124119WK_AUTHKIT_LDFLAGS_MACOS_SINCE_1015 = -framework AuthKit;
    125120
    126 FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_BACKBOARD_SERVICES_LDFLAGS) $(WK_CONTACTS_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
     121FRAMEWORK_AND_LIBRARY_LDFLAGS = -lobjc -framework CFNetwork -framework CoreAudio -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit -framework IOSurface -framework WebKitLegacy -lnetwork $(WK_ACCESSIBILITY_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_BACKBOARD_SERVICES_LDFLAGS) $(WK_RUNNINGBOARD_SERVICES_LDFLAGS) $(WK_AUTHKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_PREDICTION_LDFLAGS) $(WK_CORE_SERVICES_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_LIBSANDBOX_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_PDFKIT_LDFLAGS) $(WK_SAFE_BROWSING_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_UIKIT_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
    127122
    128123// Prevent C++ standard library basic_stringstream, operator new, delete and their related exception types from being exported as weak symbols.

  • trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm

    r269109 r269154  
    3939#import <pal/cocoa/PassKitSoftLink.h>
    4040
     41SOFT_LINK_FRAMEWORK(Contacts);
     42SOFT_LINK_CONSTANT(Contacts, CNPostalAddressCityKey, NSString *);
     43SOFT_LINK_CONSTANT(Contacts, CNPostalAddressCountryKey, NSString *);
     44SOFT_LINK_CONSTANT(Contacts, CNPostalAddressISOCountryCodeKey, NSString *);
     45SOFT_LINK_CONSTANT(Contacts, CNPostalAddressPostalCodeKey, NSString *);
     46SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStateKey, NSString *);
     47SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStreetKey, NSString *);
     48SOFT_LINK_CONSTANT(Contacts, CNPostalAddressSubAdministrativeAreaKey, NSString *);
     49SOFT_LINK_CONSTANT(Contacts, CNPostalAddressSubLocalityKey, NSString *);
     50
    4151namespace WebKit {
    4252
    … …  
    106116        case WebCore::PaymentError::ContactField::AddressLines:
    107117            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    108             postalAddressKey = CNPostalAddressStreetKey;
     118            postalAddressKey = getCNPostalAddressStreetKey();
    109119            break;
    110120           
    111121        case WebCore::PaymentError::ContactField::SubLocality:
    112122            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    113             postalAddressKey = CNPostalAddressSubLocalityKey;
     123            postalAddressKey = getCNPostalAddressSubLocalityKey();
    114124            break;
    115125           
    116126        case WebCore::PaymentError::ContactField::Locality:
    117127            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    118             postalAddressKey = CNPostalAddressCityKey;
     128            postalAddressKey = getCNPostalAddressCityKey();
    119129            break;
    120130           
    121131        case WebCore::PaymentError::ContactField::PostalCode:
    122132            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    123             postalAddressKey = CNPostalAddressPostalCodeKey;
     133            postalAddressKey = getCNPostalAddressPostalCodeKey();
    124134            break;
    125135           
    126136        case WebCore::PaymentError::ContactField::SubAdministrativeArea:
    127137            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    128             postalAddressKey = CNPostalAddressSubAdministrativeAreaKey;
     138            postalAddressKey = getCNPostalAddressSubAdministrativeAreaKey();
    129139            break;
    130140           
    131141        case WebCore::PaymentError::ContactField::AdministrativeArea:
    132142            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    133             postalAddressKey = CNPostalAddressStateKey;
     143            postalAddressKey = getCNPostalAddressStateKey();
    134144            break;
    135145           
    136146        case WebCore::PaymentError::ContactField::Country:
    137147            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    138             postalAddressKey = CNPostalAddressCountryKey;
     148            postalAddressKey = getCNPostalAddressCountryKey();
    139149            break;
    140150           
    141151        case WebCore::PaymentError::ContactField::CountryCode:
    142152            pkContactField = PAL::get_PassKit_PKContactFieldPostalAddress();
    143             postalAddressKey = CNPostalAddressISOCountryCodeKey;
     153            postalAddressKey = getCNPostalAddressISOCountryCodeKey();
    144154            break;
    145155        }
Note: See TracChangeset for help on using the changeset viewer.