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

Changeset 242356 in webkit


Ignore:
Timestamp:
Mar 4, 2019, 8:47:58 AM (7 years ago)
Author:
aestes@apple.com
Message:

[Apple Pay] Move WebPaymentCoordinatorProxy from Source/WebKit/UIProcess to Source/WebKit/Shared
​https://bugs.webkit.org/show_bug.cgi?id=195080
<rdar://problem/48421558>

Reviewed by Antti Koivisto.

Source/WebKit:

  • CMakeLists.txt:
  • DerivedSources-input.xcfilelist:
  • DerivedSources.make:
  • Shared/ApplePay/WebPaymentCoordinatorProxy.cpp: Renamed from Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp.
  • Shared/ApplePay/WebPaymentCoordinatorProxy.h: Renamed from Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h.
  • Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in: Renamed from Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in.
  • Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h: Renamed from Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h.
  • Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm: Renamed from Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm.
  • Shared/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm: Renamed from Source/WebKit/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm.
  • Shared/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm: Renamed from Source/WebKit/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm.
  • Shared/mac/WebHitTestResultData.mm:
  • SourcesCocoa.txt:
  • UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h:
  • UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.mm:
  • UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h:
  • UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
  • WebKit.xcodeproj/project.pbxproj:

Source/WTF:

  • wtf/FeatureDefines.h:
Location:
trunk/Source
Files:
4 added
1 deleted
13 edited
7 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r242353 r242356  
     12019-03-04  Andy Estes  <aestes@apple.com>
     2
     3        [Apple Pay] Move WebPaymentCoordinatorProxy from Source/WebKit/UIProcess to Source/WebKit/Shared
     4        https://bugs.webkit.org/show_bug.cgi?id=195080
     5        <rdar://problem/48421558>
     6
     7        Reviewed by Antti Koivisto.
     8
     9        * wtf/FeatureDefines.h:
     10
    1112019-03-04  Michael Catanzaro  <mcatanzaro@igalia.com>
    212

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r241337 r242356  
    180180#endif
    181181
     182#if !defined(HAVE_PASSKIT_GRANULAR_ERRORS)
     183#define HAVE_PASSKIT_GRANULAR_ERRORS 1
     184#endif
     185
    182186#endif /* PLATFORM(IOS_FAMILY) */
    183187
    … …  
    264268#if !defined(ENABLE_MEDIA_SOURCE)
    265269#define ENABLE_MEDIA_SOURCE 1
     270#endif
     271
     272#if !defined(HAVE_PASSKIT_GRANULAR_ERRORS)
     273#define HAVE_PASSKIT_GRANULAR_ERRORS __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    266274#endif
    267275

  • trunk/Source/WebKit/CMakeLists.txt

    r240683 r242356  
    2222    "${WEBKIT_DIR}/Shared/API"
    2323    "${WEBKIT_DIR}/Shared/API/c"
     24    "${WEBKIT_DIR}/Shared/ApplePay"
    2425    "${WEBKIT_DIR}/Shared/Authentication"
    2526    "${WEBKIT_DIR}/Shared/CoreIPCSupport"
    … …  
    3738    "${WEBKIT_DIR}/UIProcess/API/C"
    3839    "${WEBKIT_DIR}/UIProcess/API/cpp"
    39     "${WEBKIT_DIR}/UIProcess/ApplePay"
    4040    "${WEBKIT_DIR}/UIProcess/Authentication"
    4141    "${WEBKIT_DIR}/UIProcess/Automation"

  • trunk/Source/WebKit/ChangeLog

    r242355 r242356  
     12019-03-04  Andy Estes  <aestes@apple.com>
     2
     3        [Apple Pay] Move WebPaymentCoordinatorProxy from Source/WebKit/UIProcess to Source/WebKit/Shared
     4        https://bugs.webkit.org/show_bug.cgi?id=195080
     5        <rdar://problem/48421558>
     6
     7        Reviewed by Antti Koivisto.
     8
     9        * CMakeLists.txt:
     10        * DerivedSources-input.xcfilelist:
     11        * DerivedSources.make:
     12        * Shared/ApplePay/WebPaymentCoordinatorProxy.cpp: Renamed from Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp.
     13        * Shared/ApplePay/WebPaymentCoordinatorProxy.h: Renamed from Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h.
     14        * Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in: Renamed from Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in.
     15        * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h: Renamed from Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h.
     16        * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm: Renamed from Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm.
     17        * Shared/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm: Renamed from Source/WebKit/UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm.
     18        * Shared/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm: Renamed from Source/WebKit/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm.
     19        * Shared/mac/WebHitTestResultData.mm:
     20        * SourcesCocoa.txt:
     21        * UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h:
     22        * UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.mm:
     23        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h:
     24        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
     25        * WebKit.xcodeproj/project.pbxproj:
     26
    1272019-03-04  Jer Noble  <jer.noble@apple.com>
    228

  • trunk/Source/WebKit/DerivedSources-input.xcfilelist

    r242139 r242356  
    5353$(PROJECT_DIR)/Scripts/webkit/parser.py
    5454$(PROJECT_DIR)/Shared/API/Cocoa/RemoteObjectRegistry.messages.in
     55$(PROJECT_DIR)/Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in
    5556$(PROJECT_DIR)/Shared/Authentication/AuthenticationManager.messages.in
    5657$(PROJECT_DIR)/Shared/AuxiliaryProcess.messages.in
    … …  
    5960$(PROJECT_DIR)/Shared/WebConnection.messages.in
    6061$(PROJECT_DIR)/Shared/WebPreferences.yaml
    61 $(PROJECT_DIR)/UIProcess/ApplePay/WebPaymentCoordinatorProxy.messages.in
    6262$(PROJECT_DIR)/UIProcess/Automation/Automation.json
    6363$(PROJECT_DIR)/UIProcess/Automation/WebAutomationSession.messages.in

  • trunk/Source/WebKit/DerivedSources.make

    r242139 r242356  
    3636    $(WebKit2)/Shared \
    3737    $(WebKit2)/Shared/API/Cocoa \
     38    $(WebKit2)/Shared/ApplePay \
    3839    $(WebKit2)/Shared/Authentication \
    3940    $(WebKit2)/Shared/mac \
    … …  
    6566    $(WebKit2)/WebProcess \
    6667    $(WebKit2)/UIProcess \
    67     $(WebKit2)/UIProcess/ApplePay \
    6868    $(WebKit2)/UIProcess/Automation \
    6969    $(WebKit2)/UIProcess/Cocoa \

  • trunk/Source/WebKit/Shared/ApplePay/WebPaymentCoordinatorProxy.h

    r242355 r242356  
    126126    Vector<String> platformAvailablePaymentNetworks();
    127127    bool platformCanMakePayments();
    128     void platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, WTF::Function<void (bool)>&& completionHandler);
    129     void platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, WTF::Function<void (bool)>&& completionHandler);
     128    void platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, WTF::Function<void(bool)>&& completionHandler);
     129    void platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, WTF::Function<void(bool)>&& completionHandler);
    130130    void platformShowPaymentUI(const URL& originatingURL, const Vector<URL>& linkIconURLs, const WebCore::ApplePaySessionPaymentRequest&, CompletionHandler<void(bool)>&&);
    131131    void platformCompleteMerchantValidation(const WebCore::PaymentMerchantSession&);

  • trunk/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h

    r242355 r242356  
    2828#if ENABLE(APPLE_PAY)
    2929
     30#import "WebPaymentCoordinatorProxy.h"
    3031#import <WebCore/PaymentHeaders.h>
    3132#import <pal/spi/cocoa/PassKitSPI.h>
    … …  
    3839    RetainPtr<NSArray> _shippingMethods;
    3940
    40     BlockPtr<void (PKPaymentMerchantSession *, NSError *)> _sessionBlock;
     41    BlockPtr<void(PKPaymentMerchantSession *, NSError *)> _sessionBlock;
    4142
    4243    BOOL _didReachFinalState;
    43 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
    44     BlockPtr<void (PKPaymentAuthorizationResult *)> _paymentAuthorizedCompletion;
    45     BlockPtr<void (PKPaymentRequestPaymentMethodUpdate *)> _didSelectPaymentMethodCompletion;
    46     BlockPtr<void (PKPaymentRequestShippingMethodUpdate *)> _didSelectShippingMethodCompletion;
    47     BlockPtr<void (PKPaymentRequestShippingContactUpdate *)> _didSelectShippingContactCompletion;
     44#if HAVE(PASSKIT_GRANULAR_ERRORS)
     45    BlockPtr<void(PKPaymentAuthorizationResult *)> _paymentAuthorizedCompletion;
     46    BlockPtr<void(PKPaymentRequestPaymentMethodUpdate *)> _didSelectPaymentMethodCompletion;
     47    BlockPtr<void(PKPaymentRequestShippingMethodUpdate *)> _didSelectShippingMethodCompletion;
     48    BlockPtr<void(PKPaymentRequestShippingContactUpdate *)> _didSelectShippingContactCompletion;
    4849#else
    49     BlockPtr<void (PKPaymentAuthorizationStatus)> _paymentAuthorizedCompletion;
    50     BlockPtr<void (NSArray *)> _didSelectPaymentMethodCompletion;
    51     BlockPtr<void (PKPaymentAuthorizationStatus, NSArray *)> _didSelectShippingMethodCompletion;
    52     BlockPtr<void (PKPaymentAuthorizationStatus, NSArray *, NSArray *)> _didSelectShippingContactCompletion;
     50    BlockPtr<void(PKPaymentAuthorizationStatus)> _paymentAuthorizedCompletion;
     51    BlockPtr<void(NSArray *)> _didSelectPaymentMethodCompletion;
     52    BlockPtr<void(PKPaymentAuthorizationStatus, NSArray *)> _didSelectShippingMethodCompletion;
     53    BlockPtr<void(PKPaymentAuthorizationStatus, NSArray *, NSArray *)> _didSelectShippingContactCompletion;
    5354#endif
    5455}

  • trunk/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

    r242355 r242356  
    3838#import <wtf/URL.h>
    3939
    40 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300)
     40#if HAVE(PASSKIT_GRANULAR_ERRORS)
    4141SOFT_LINK_FRAMEWORK(Contacts)
    4242SOFT_LINK_CONSTANT(Contacts, CNPostalAddressStreetKey, NSString *);
    … …  
    6767    _webPaymentCoordinatorProxy = nullptr;
    6868    if (_paymentAuthorizedCompletion) {
    69 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     69#if HAVE(PASSKIT_GRANULAR_ERRORS)
    7070        _paymentAuthorizedCompletion(adoptNS([PAL::allocPKPaymentAuthorizationResultInstance() initWithStatus:PKPaymentAuthorizationStatusFailure errors:@[ ]]).get());
    7171#else
    … …  
    115115}
    116116
    117 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
     117#if HAVE(PASSKIT_GRANULAR_ERRORS)
    118118
    119119- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment handler:(void (^)(PKPaymentAuthorizationResult *result))completion
    120120{
    121 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
    122121    if (!_webPaymentCoordinatorProxy) {
    123122        completion(adoptNS([PAL::allocPKPaymentAuthorizationResultInstance() initWithStatus:PKPaymentAuthorizationStatusFailure errors:@[ ]]).get());
    … …  
    129128
    130129    _webPaymentCoordinatorProxy->didAuthorizePayment(WebCore::Payment(payment));
    131 #endif
    132130}
    133131
    134132- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectPaymentMethod:(PKPaymentMethod *)paymentMethod handler:(void (^)(PKPaymentRequestPaymentMethodUpdate *update))completion
    135133{
    136 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
    137134    if (!_webPaymentCoordinatorProxy) {
    138135        completion(adoptNS([PAL::allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:@[ ]]).get());
    … …  
    143140    _didSelectPaymentMethodCompletion = completion;
    144141    _webPaymentCoordinatorProxy->didSelectPaymentMethod(WebCore::PaymentMethod(paymentMethod));
    145 #endif
    146142}
    147143
    148144- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingMethod:(PKShippingMethod *)shippingMethod handler:(void (^)(PKPaymentRequestShippingMethodUpdate *update))completion {
    149 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
    150145    if (!_webPaymentCoordinatorProxy) {
    151146        completion(adoptNS([PAL::allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:@[ ]]).get());
    … …  
    156151    _didSelectShippingMethodCompletion = completion;
    157152    _webPaymentCoordinatorProxy->didSelectShippingMethod(toShippingMethod(shippingMethod));
    158 #endif
    159153}
    160154
    161155- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didSelectShippingContact:(PKContact *)contact handler:(void (^)(PKPaymentRequestShippingContactUpdate *update))completion
    162156{
    163 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
    164157    if (!_webPaymentCoordinatorProxy) {
    165158        completion(adoptNS([PAL::allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:@[ ] paymentSummaryItems:@[ ] shippingMethods:@[ ]]).get());
    … …  
    170163    _didSelectShippingContactCompletion = completion;
    171164    _webPaymentCoordinatorProxy->didSelectShippingContact(WebCore::PaymentContact(contact));
    172 #endif
    173 }
    174 
    175 #endif
    176 
    177 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)
     165}
     166
     167#endif
     168
     169#if !HAVE(PASSKIT_GRANULAR_ERRORS)
    178170
    179171- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment completion:(void (^)(PKPaymentAuthorizationStatus))completion
    … …  
    262254}
    263255
    264 void WebPaymentCoordinatorProxy::platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, WTF::Function<void (bool)>&& completionHandler)
    265 {
    266 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     256void WebPaymentCoordinatorProxy::platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, WTF::Function<void(bool)>&& completionHandler)
     257{
     258#if HAVE(PASSKIT_GRANULAR_ERRORS)
    267259    PKCanMakePaymentsWithMerchantIdentifierDomainAndSourceApplication(merchantIdentifier, domainName, m_client.paymentCoordinatorSourceApplicationSecondaryIdentifier(*this), makeBlockPtr([completionHandler = WTFMove(completionHandler)](BOOL canMakePayments, NSError *error) mutable {
    268260        if (error)
    … …  
    285277}
    286278
    287 void WebPaymentCoordinatorProxy::platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, WTF::Function<void (bool)>&& completionHandler)
     279void WebPaymentCoordinatorProxy::platformOpenPaymentSetup(const String& merchantIdentifier, const String& domainName, WTF::Function<void(bool)>&& completionHandler)
    288280{
    289281    auto passLibrary = adoptNS([PAL::allocPKPassLibraryInstance() init]);
    … …  
    295287}
    296288
    297 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     289#if HAVE(PASSKIT_GRANULAR_ERRORS)
    298290static RetainPtr<NSSet> toPKContactFields(const WebCore::ApplePaySessionPaymentRequest::ContactFields& contactFields)
    299291{
    … …  
    417409}
    418410   
    419 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     411#if HAVE(PASSKIT_GRANULAR_ERRORS)
    420412static RetainPtr<NSSet> toNSSet(const Vector<String>& strings)
    421413{
    … …  
    429421    return WTFMove(mutableSet);
    430422}
    431 #endif
    432 
    433 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
     423
    434424static PKPaymentRequestAPIType toAPIType(WebCore::ApplePaySessionPaymentRequest::Requester requester)
    435425{
    … …  
    458448        [result setThumbnailURL:linkIconURLs[0]];
    459449
    460 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
     450#if HAVE(PASSKIT_GRANULAR_ERRORS)
    461451    [result setAPIType:toAPIType(paymentRequest.requester())];
    462452#endif
    … …  
    466456    [result setBillingContact:paymentRequest.billingContact().pkContact()];
    467457    [result setShippingContact:paymentRequest.shippingContact().pkContact()];
    468 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     458#if HAVE(PASSKIT_GRANULAR_ERRORS)
    469459    [result setRequiredBillingContactFields:toPKContactFields(paymentRequest.requiredBillingContactFields()).get()];
    470460    [result setRequiredShippingContactFields:toPKContactFields(paymentRequest.requiredShippingContactFields()).get()];
    … …  
    502492    }
    503493
    504 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     494#if HAVE(PASSKIT_GRANULAR_ERRORS)
    505495    [result setSupportedCountries:toNSSet(paymentRequest.supportedCountries()).get()];
    506496#endif
    … …  
    524514}
    525515
    526 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     516#if HAVE(PASSKIT_GRANULAR_ERRORS)
    527517static PKPaymentAuthorizationStatus toPKPaymentAuthorizationStatus(WebCore::PaymentAuthorizationStatus status)
    528518{
    … …  
    693683    m_paymentAuthorizationViewControllerDelegate->_didReachFinalState = WebCore::isFinalStateResult(result);
    694684
    695 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     685#if HAVE(PASSKIT_GRANULAR_ERRORS)
    696686    auto status = result ? result->status : WebCore::PaymentAuthorizationStatus::Success;
    697687    auto pkPaymentAuthorizationResult = adoptNS([PAL::allocPKPaymentAuthorizationResultInstance() initWithStatus:toPKPaymentAuthorizationStatus(status) errors:result ? toNSErrors(result->errors).get() : @[ ]]);
    … …  
    720710        m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems = toPKPaymentSummaryItems(update->newTotalAndLineItems);
    721711
    722 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     712#if HAVE(PASSKIT_GRANULAR_ERRORS)
    723713    auto pkShippingMethodUpdate = adoptNS([PAL::allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems.get()]);
    724714    m_paymentAuthorizationViewControllerDelegate->_didSelectShippingMethodCompletion(pkShippingMethodUpdate.get());
    … …  
    729719}
    730720
    731 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)
     721#if !HAVE(PASSKIT_GRANULAR_ERRORS)
    732722static PKPaymentAuthorizationStatus toPKPaymentAuthorizationStatus(const Optional<WebCore::ShippingContactUpdate>& update)
    733723{
    … …  
    772762    }
    773763
    774 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     764#if HAVE(PASSKIT_GRANULAR_ERRORS)
    775765    auto pkShippingContactUpdate = adoptNS([PAL::allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:update ? toNSErrors(update->errors).get() : @[ ] paymentSummaryItems:m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems.get() shippingMethods:m_paymentAuthorizationViewControllerDelegate->_shippingMethods.get()]);
    776766    m_paymentAuthorizationViewControllerDelegate->_didSelectShippingContactCompletion(pkShippingContactUpdate.get());
    … …  
    789779        m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems = toPKPaymentSummaryItems(update->newTotalAndLineItems);
    790780
    791 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
     781#if HAVE(PASSKIT_GRANULAR_ERRORS)
    792782    auto pkPaymentMethodUpdate = adoptNS([PAL::allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:m_paymentAuthorizationViewControllerDelegate->_paymentSummaryItems.get()]);
    793783    m_paymentAuthorizationViewControllerDelegate->_didSelectPaymentMethodCompletion(pkPaymentMethodUpdate.get());

  • trunk/Source/WebKit/Shared/mac/WebHitTestResultData.mm

    r239427 r242356  
    3030
    3131#import "ArgumentCodersCF.h"
     32#import "ArgumentCodersCocoa.h"
    3233#import "Decoder.h"
    3334#import "Encoder.h"

  • trunk/Source/WebKit/SourcesCocoa.txt

    r241635 r242356  
    113113Shared/API/Cocoa/WKRemoteObject.mm
    114114Shared/API/Cocoa/WKRemoteObjectCoder.mm
     115
     116Shared/ApplePay/WebPaymentCoordinatorProxy.cpp
     117Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
     118Shared/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm
     119Shared/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
    115120
    116121Shared/APIWebArchive.mm
    … …  
    214219UIProcess/WKImagePreviewViewController.mm
    215220UIProcess/WKInspectorHighlightView.mm
    216 
    217 UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp
    218221
    219222UIProcess/API/APIWebsiteDataRecord.cpp
    … …  
    303306UIProcess/API/mac/WKView.mm
    304307
    305 UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
    306 
    307 UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm
    308 
    309 UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
    310 
    311308UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm
    312309UIProcess/Authentication/cocoa/SecKeyProxyStore.mm

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.h

    r242132 r242356  
    4545    void commitStateAfterChildren(const WebCore::ScrollingStateNode&) override;
    4646
    47     FloatPoint minimumScrollPosition() const override;
    48     FloatPoint maximumScrollPosition() const override;
     47    WebCore::FloatPoint minimumScrollPosition() const override;
     48    WebCore::FloatPoint maximumScrollPosition() const override;
    4949
    5050    void repositionScrollingLayers() override;

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeFrameScrollingNodeRemoteIOS.mm

    r242132 r242356  
    3030
    3131#import "ScrollingTreeScrollingNodeDelegateIOS.h"
     32#import <WebCore/ScrollingStateFrameScrollingNode.h>
    3233#import <WebCore/ScrollingStateScrollingNode.h>
     34#import <WebCore/ScrollingTree.h>
    3335
    3436namespace WebKit {

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h

    r242132 r242356  
    6767
    6868#if ENABLE(POINTER_EVENTS)
    69     Optional<TouchActionData> touchActionData() const;
     69    Optional<WebCore::TouchActionData> touchActionData() const;
    7070    void cancelPointersForGestureRecognizer(UIGestureRecognizer*);
    7171#endif

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm

    r242132 r242356  
    2929#if PLATFORM(IOS_FAMILY) && ENABLE(ASYNC_SCROLLING)
    3030
     31#import "RemoteScrollingCoordinatorProxy.h"
     32#import "RemoteScrollingTree.h"
     33#import "UIKitSPI.h"
     34#import "WebPageProxy.h"
    3135#import <QuartzCore/QuartzCore.h>
    3236#import <UIKit/UIPanGestureRecognizer.h>

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r242336 r242356  
    49944994                        children = (
    49954995                                BCDDB314124EBCEF0048D13C /* API */,
     4996                                1AB1F7761D1B30A9007C9BD1 /* ApplePay */,
    49964997                                518E8EF116B208F000E91429 /* Authentication */,
    49974998                                1AAF0C4712B16328008E49E2 /* cf */,
    … …  
    73347335                        children = (
    73357336                                BC032DC410F4387C0058C15A /* API */,
    7336                                 1AB1F7761D1B30A9007C9BD1 /* ApplePay */,
    73377337                                512F588D12A8836F00629530 /* Authentication */,
    73387338                                9955A6E81C79809000EB6A93 /* Automation */,
Note: See TracChangeset for help on using the changeset viewer.