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

Changeset 282464 in webkit


Ignore:
Timestamp:
Sep 15, 2021, 11:37:12 AM (5 years ago)
Author:
Devin Rousso
Message:

[Payment Request] Clean up some WKA hooks
​https://bugs.webkit.org/show_bug.cgi?id=230182
<rdar://problem/78824639>

Reviewed by Tim Horton.

Source/WebCore:

  • Modules/applepay/ApplePaySession.cpp:

(WebCore::convertAndValidate):
(WebCore::merge):

  • Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:

(WebCore::convertAndValidate):

  • testing/MockPaymentCoordinator.h:
  • testing/MockPaymentCoordinator.cpp:

(WebCore::MockPaymentCoordinator::showPaymentUI):
(WebCore::MockPaymentCoordinator::completeShippingMethodSelection):
(WebCore::MockPaymentCoordinator::completeShippingContactSelection):
(WebCore::MockPaymentCoordinator::completePaymentMethodSelection):
(WebCore::MockPaymentCoordinator::completeCouponCodeChange):
(WebCore::MockPaymentCoordinator::merge):
Instead of using #define, create actual functions so that the code in WKA is cleaner.

  • Modules/applepay/ApplePayRequestBase.h:
  • Modules/applepay/ApplePayRequestBase.cpp:

(WebCore::convertAndValidate):
Remove unnecessary WKA hooks.

  • Modules/applepay/PaymentSummaryItems.h:
  • Modules/applepay/cocoa/PaymentSummaryItemsCocoa.mm:

(WebCore::platformRecurringSummaryItem): Added.
(WebCore::platformDeferredSummaryItem): Added.
(WebCore::platformSummaryItem): Added.
(WebCore::toPKPaymentSummaryItem): Deleted.
Expose functions that convert ApplePayLineItem to PKPaymentSummaryItem (and subclasses).

Source/WebCore/PAL:

  • pal/spi/cocoa/PassKitSPI.h:

Source/WebKit:

  • Platform/cocoa/PaymentAuthorizationPresenter.mm:

(WebKit::merge):
(WebKit::PaymentAuthorizationPresenter::completePaymentMethodSelection):
(WebKit::PaymentAuthorizationPresenter::completeShippingContactSelection):
(WebKit::PaymentAuthorizationPresenter::completeShippingMethodSelection):
(WebKit::PaymentAuthorizationPresenter::completeCouponCodeChange):

  • Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:

(WebKit::merge):
(WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest):
Instead of using #define, create actual functions so that the code in WKA is cleaner.

Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r282463 r282464  
     12021-09-15  Devin Rousso  <drousso@apple.com>
     2
     3        [Payment Request] Clean up some WKA hooks
     4        https://bugs.webkit.org/show_bug.cgi?id=230182
     5        <rdar://problem/78824639>
     6
     7        Reviewed by Tim Horton.
     8
     9        * Modules/applepay/ApplePaySession.cpp:
     10        (WebCore::convertAndValidate):
     11        (WebCore::merge):
     12        * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
     13        (WebCore::convertAndValidate):
     14        * testing/MockPaymentCoordinator.h:
     15        * testing/MockPaymentCoordinator.cpp:
     16        (WebCore::MockPaymentCoordinator::showPaymentUI):
     17        (WebCore::MockPaymentCoordinator::completeShippingMethodSelection):
     18        (WebCore::MockPaymentCoordinator::completeShippingContactSelection):
     19        (WebCore::MockPaymentCoordinator::completePaymentMethodSelection):
     20        (WebCore::MockPaymentCoordinator::completeCouponCodeChange):
     21        (WebCore::MockPaymentCoordinator::merge):
     22        Instead of using `#define`, create actual functions so that the code in WKA is cleaner.
     23
     24        * Modules/applepay/ApplePayRequestBase.h:
     25        * Modules/applepay/ApplePayRequestBase.cpp:
     26        (WebCore::convertAndValidate):
     27        Remove unnecessary WKA hooks.
     28
     29        * Modules/applepay/PaymentSummaryItems.h:
     30        * Modules/applepay/cocoa/PaymentSummaryItemsCocoa.mm:
     31        (WebCore::platformRecurringSummaryItem): Added.
     32        (WebCore::platformDeferredSummaryItem): Added.
     33        (WebCore::platformSummaryItem): Added.
     34        (WebCore::toPKPaymentSummaryItem): Deleted.
     35        Expose functions that convert `ApplePayLineItem` to `PKPaymentSummaryItem` (and subclasses).
     36
    1372021-09-15  Ziran Sun  <zsun@igalia.com>
    238

  • trunk/Source/WebCore/Modules/applepay/ApplePayRequestBase.cpp

    r278630 r282464  
    3131#include "PaymentCoordinator.h"
    3232#include <wtf/text/StringConcatenateNumbers.h>
    33 
    34 #if USE(APPLE_INTERNAL_SDK)
    35 #include <WebKitAdditions/ApplePayRequestBaseAdditions.cpp>
    36 #endif
    3733
    3834namespace WebCore {
    … …  
    128124#endif
    129125
    130 #if defined(ApplePayRequestBaseAdditions_convertAndValidate_request)
    131     ApplePayRequestBaseAdditions_convertAndValidate_request
    132 #endif
    133 
    134126    return WTFMove(result);
    135127}

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

    r278630 r282464  
    3434#include "ApplePayShippingContactEditingMode.h"
    3535
    36 #if USE(APPLE_INTERNAL_SDK)
    37 #include <WebKitAdditions/ApplePayRequestBaseAdditions.h>
    38 #endif
    39 
    4036namespace WebCore {
    4137
    … …  
    6965    std::optional<ApplePayShippingContactEditingMode> shippingContactEditingMode;
    7066#endif
    71 
    72 #if defined(ApplePayRequestBaseAdditions_members)
    73     ApplePayRequestBaseAdditions_members
    74 #endif
    7567};
    7668

  • trunk/Source/WebCore/Modules/applepay/ApplePaySession.cpp

    r278630 r282464  
    143143}
    144144
     145#if !USE(APPLE_INTERNAL_SDK)
     146static ExceptionOr<void> merge(ApplePaySessionPaymentRequest&, ApplePayPaymentRequest&) { return { }; }
     147#endif
     148
    145149static ExceptionOr<ApplePaySessionPaymentRequest> convertAndValidate(Document& document, unsigned version, ApplePayPaymentRequest&& paymentRequest, const PaymentCoordinator& paymentCoordinator)
    146150{
    … …  
    172176    }
    173177
    174 #if defined(ApplePaySessionAdditions_convertAndValidate_request)
    175     ApplePaySessionAdditions_convertAndValidate_request
    176 #endif
     178    if (auto mergeResult = merge(result, paymentRequest); mergeResult.hasException())
     179        return mergeResult.releaseException();
    177180
    178181    // FIXME: Merge this validation into the validation we are doing above.

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

    r273143 r282464  
    2929
    3030OBJC_CLASS NSArray;
     31OBJC_CLASS PKDeferredPaymentSummaryItem;
     32OBJC_CLASS PKPaymentSummaryItem;
     33OBJC_CLASS PKRecurringPaymentSummaryItem;
    3134
    3235namespace WebCore {
    … …  
    3437struct ApplePayLineItem;
    3538
     39#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
     40WEBCORE_EXPORT PKRecurringPaymentSummaryItem *platformRecurringSummaryItem(const ApplePayLineItem&);
     41#endif
     42
     43#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
     44WEBCORE_EXPORT PKDeferredPaymentSummaryItem *platformDeferredSummaryItem(const ApplePayLineItem&);
     45#endif
     46
     47WEBCORE_EXPORT PKPaymentSummaryItem *platformSummaryItem(const ApplePayLineItem&);
    3648WEBCORE_EXPORT NSArray *platformSummaryItems(const ApplePayLineItem& total, const Vector<ApplePayLineItem>&);
    3749

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

    r278630 r282464  
    5151}
    5252
    53 #if HAVE(PASSKIT_RECURRING_LINE_ITEM) || HAVE(PASSKIT_DEFERRED_LINE_ITEM)
     53#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM) || HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
    5454
    5555static NSDate *toDate(double date)
    … …  
    5858}
    5959
    60 #endif // HAVE(PASSKIT_RECURRING_LINE_ITEM) || HAVE(PASSKIT_DEFERRED_LINE_ITEM)
     60#endif // HAVE(PASSKIT_RECURRING_SUMMARY_ITEM) || HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
    6161
    62 #if HAVE(PASSKIT_RECURRING_LINE_ITEM)
     62#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
    6363
    6464static NSCalendarUnit toCalendarUnit(ApplePayRecurringPaymentDateUnit unit)
    … …  
    8282}
    8383
    84 #endif // HAVE(PASSKIT_RECURRING_LINE_ITEM)
     84PKRecurringPaymentSummaryItem *platformRecurringSummaryItem(const ApplePayLineItem& lineItem)
     85{
     86    ASSERT(lineItem.paymentTiming == ApplePayPaymentTiming::Recurring);
     87    PKRecurringPaymentSummaryItem *summaryItem = [PAL::getPKRecurringPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount) type:toPKPaymentSummaryItemType(lineItem.type)];
     88    if (!std::isnan(lineItem.recurringPaymentStartDate))
     89        summaryItem.startDate = toDate(lineItem.recurringPaymentStartDate);
     90    summaryItem.intervalUnit = toCalendarUnit(lineItem.recurringPaymentIntervalUnit);
     91    summaryItem.intervalCount = lineItem.recurringPaymentIntervalCount;
     92    if (!std::isnan(lineItem.recurringPaymentEndDate))
     93        summaryItem.endDate = toDate(lineItem.recurringPaymentEndDate);
     94    return summaryItem;
     95}
    8596
    86 static PKPaymentSummaryItem *toPKPaymentSummaryItem(const ApplePayLineItem& lineItem)
     97#endif // HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
     98
     99#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
     100
     101PKDeferredPaymentSummaryItem *platformDeferredSummaryItem(const ApplePayLineItem& lineItem)
    87102{
    88 #if HAVE(PASSKIT_RECURRING_LINE_ITEM) || HAVE(PASSKIT_DEFERRED_LINE_ITEM)
     103    ASSERT(lineItem.paymentTiming == ApplePayPaymentTiming::Deferred);
     104    PKDeferredPaymentSummaryItem *summaryItem = [PAL::getPKDeferredPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount) type:toPKPaymentSummaryItemType(lineItem.type)];
     105    if (!std::isnan(lineItem.deferredPaymentDate))
     106        summaryItem.deferredDate = toDate(lineItem.deferredPaymentDate);
     107    return summaryItem;
     108}
     109
     110#endif // HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
     111
     112PKPaymentSummaryItem *platformSummaryItem(const ApplePayLineItem& lineItem)
     113{
     114#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM) || HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
    89115    switch (lineItem.paymentTiming) {
    90116    case ApplePayPaymentTiming::Immediate:
    … …  
    92118
    93119    case ApplePayPaymentTiming::Recurring:
    94 #if HAVE(PASSKIT_RECURRING_LINE_ITEM)
    95     {
    96         PKRecurringPaymentSummaryItem *summaryItem = [PAL::getPKRecurringPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount) type:toPKPaymentSummaryItemType(lineItem.type)];
    97         if (!std::isnan(lineItem.recurringPaymentStartDate))
    98             summaryItem.startDate = toDate(lineItem.recurringPaymentStartDate);
    99         summaryItem.intervalUnit = toCalendarUnit(lineItem.recurringPaymentIntervalUnit);
    100         summaryItem.intervalCount = lineItem.recurringPaymentIntervalCount;
    101         if (!std::isnan(lineItem.recurringPaymentEndDate))
    102             summaryItem.endDate = toDate(lineItem.recurringPaymentEndDate);
    103         return summaryItem;
    104     }
     120#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
     121        return platformRecurringSummaryItem(lineItem);
    105122#else
    106123        break;
    … …  
    108125
    109126    case ApplePayPaymentTiming::Deferred:
    110 #if HAVE(PASSKIT_DEFERRED_LINE_ITEM)
    111     {
    112         PKDeferredPaymentSummaryItem *summaryItem = [PAL::getPKDeferredPaymentSummaryItemClass() summaryItemWithLabel:lineItem.label amount:toDecimalNumber(lineItem.amount) type:toPKPaymentSummaryItemType(lineItem.type)];
    113         if (!std::isnan(lineItem.deferredPaymentDate))
    114             summaryItem.deferredDate = toDate(lineItem.deferredPaymentDate);
    115         return summaryItem;
    116     }
     127#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
     128        return platformDeferredSummaryItem(lineItem);
    117129#else
    118130        break;
    … …  
    128140    NSMutableArray *paymentSummaryItems = [NSMutableArray arrayWithCapacity:lineItems.size() + 1];
    129141    for (auto& lineItem : lineItems) {
    130         if (PKPaymentSummaryItem *summaryItem = toPKPaymentSummaryItem(lineItem))
     142        if (PKPaymentSummaryItem *summaryItem = platformSummaryItem(lineItem))
    131143            [paymentSummaryItems addObject:summaryItem];
    132144    }
    133145
    134     if (PKPaymentSummaryItem *totalItem = toPKPaymentSummaryItem(total))
     146    if (PKPaymentSummaryItem *totalItem = platformSummaryItem(total))
    135147        [paymentSummaryItems addObject:totalItem];
    136148

  • trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp

    r280459 r282464  
    228228}
    229229
    230 #if !ENABLE(APPLE_PAY_PAYMENT_DETAILS_DATA)
     230#if !USE(APPLE_INTERNAL_SDK)
    231231static void merge(ApplePaySessionPaymentRequest&, ApplePayModifier&&) { }
    232 #endif // !ENABLE(APPLE_PAY_PAYMENT_DETAILS_DATA)
     232#endif
    233233
    234234ExceptionOr<void> ApplePayPaymentHandler::show(Document& document)
    … …  
    538538}
    539539
    540 #if !ENABLE(APPLE_PAY_PAYMENT_DETAILS_DATA)
     540#if !USE(APPLE_INTERNAL_SDK)
    541541static void merge(ApplePayDetailsUpdateBase&, ApplePayModifier&&) { }
    542 #endif // !ENABLE(APPLE_PAY_PAYMENT_DETAILS_DATA)
     542#endif
    543543
    544544ExceptionOr<void> ApplePayPaymentHandler::shippingAddressUpdated(Vector<RefPtr<ApplePayError>>&& errors)

  • trunk/Source/WebCore/PAL/ChangeLog

    r282398 r282464  
     12021-09-15  Devin Rousso  <drousso@apple.com>
     2
     3        [Payment Request] Clean up some WKA hooks
     4        https://bugs.webkit.org/show_bug.cgi?id=230182
     5        <rdar://problem/78824639>
     6
     7        Reviewed by Tim Horton.
     8
     9        * pal/spi/cocoa/PassKitSPI.h:
     10
    1112021-09-14  Myles C. Maxfield  <mmaxfield@apple.com>
    212

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h

    r280459 r282464  
    7272#endif
    7373
     74#import <WebKitAdditions/PassKitSPIAdditions.h>
     75
    7476#else
    7577

  • trunk/Source/WebCore/testing/MockPaymentCoordinator.cpp

    r280459 r282464  
    122122    m_shippingContactEditingMode = request.shippingContactEditingMode();
    123123#endif
    124 #if defined(MockPaymentCoordinatorAdditions_showPaymentUI)
    125     MockPaymentCoordinatorAdditions_showPaymentUI
    126 #endif
     124    merge(request);
    127125
    128126    ASSERT(showCount == hideCount);
    … …  
    151149    m_shippingMethods = WTFMove(shippingMethodUpdate->newShippingMethods);
    152150#endif
    153 #if defined(MockPaymentCoordinatorAdditions_completeShippingMethodSelection)
    154     MockPaymentCoordinatorAdditions_completeShippingMethodSelection
    155 #endif
     151    merge(*shippingMethodUpdate);
    156152}
    157153
    … …  
    175171    m_shippingMethods = WTFMove(shippingContactUpdate->newShippingMethods);
    176172    m_errors = convert(WTFMove(shippingContactUpdate->errors));
    177 #if defined(MockPaymentCoordinatorAdditions_completeShippingContactSelection)
    178     MockPaymentCoordinatorAdditions_completeShippingContactSelection
    179 #endif
     173    merge(*shippingContactUpdate);
    180174}
    181175
    … …  
    191185    m_errors = convert(WTFMove(paymentMethodUpdate->errors));
    192186#endif
    193 #if defined(MockPaymentCoordinatorAdditions_completePaymentMethodSelection)
    194     MockPaymentCoordinatorAdditions_completePaymentMethodSelection
    195 #endif
     187    merge(*paymentMethodUpdate);
    196188}
    197189
    … …  
    207199    m_shippingMethods = WTFMove(couponCodeUpdate->newShippingMethods);
    208200    m_errors = convert(WTFMove(couponCodeUpdate->errors));
    209 #if defined(MockPaymentCoordinatorAdditions_completeCouponCodeChange)
    210     MockPaymentCoordinatorAdditions_completeCouponCodeChange
    211 #endif
     201    merge(*couponCodeUpdate);
    212202}
    213203
    … …  
    307297}
    308298
     299#if !USE(APPLE_INTERNAL_SDK)
     300void MockPaymentCoordinator::merge(const ApplePaySessionPaymentRequest&) { }
     301void MockPaymentCoordinator::merge(ApplePayDetailsUpdateBase&) { }
     302#endif
     303
    309304} // namespace WebCore
    310305

  • trunk/Source/WebCore/testing/MockPaymentCoordinator.h

    r279635 r282464  
    4646namespace WebCore {
    4747
     48class ApplePaySessionPaymentRequest;
    4849class Page;
     50struct ApplePayDetailsUpdateBase;
    4951struct ApplePayPaymentMethod;
    5052
    … …  
    118120    void dispatchIfShowing(Function<void()>&&);
    119121
     122    void merge(const ApplePaySessionPaymentRequest&);
     123    void merge(ApplePayDetailsUpdateBase&);
     124
    120125    Page& m_page;
    121126    bool m_canMakePayments { true };

  • trunk/Source/WebKit/ChangeLog

    r282456 r282464  
     12021-09-15  Devin Rousso  <drousso@apple.com>
     2
     3        [Payment Request] Clean up some WKA hooks
     4        https://bugs.webkit.org/show_bug.cgi?id=230182
     5        <rdar://problem/78824639>
     6
     7        Reviewed by Tim Horton.
     8
     9        * Platform/cocoa/PaymentAuthorizationPresenter.mm:
     10        (WebKit::merge):
     11        (WebKit::PaymentAuthorizationPresenter::completePaymentMethodSelection):
     12        (WebKit::PaymentAuthorizationPresenter::completeShippingContactSelection):
     13        (WebKit::PaymentAuthorizationPresenter::completeShippingMethodSelection):
     14        (WebKit::PaymentAuthorizationPresenter::completeCouponCodeChange):
     15        * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
     16        (WebKit::merge):
     17        (WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest):
     18        Instead of using `#define`, create actual functions so that the code in WKA is cleaner.
     19
    1202021-09-15  Michael Catanzaro  <mcatanzaro@gnome.org>
    221

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

    r280459 r282464  
    209209}
    210210
     211#if !USE(APPLE_INTERNAL_SDK)
     212static void merge(PKPaymentRequestUpdate *, WebCore::ApplePayDetailsUpdateBase&) { }
     213#endif
     214
    211215void PaymentAuthorizationPresenter::completePaymentMethodSelection(std::optional<WebCore::ApplePayPaymentMethodUpdate>&& update)
    212216{
    … …  
    225229    [paymentMethodUpdate setInstallmentGroupIdentifier:WTFMove(update->installmentGroupIdentifier)];
    226230#endif // HAVE(PASSKIT_INSTALLMENTS) && ENABLE(APPLE_PAY_INSTALLMENTS)
    227 #if defined(PaymentAuthorizationPresenterAdditions_completePaymentMethodSelection)
    228     PaymentAuthorizationPresenterAdditions_completePaymentMethodSelection
    229 #endif
     231    merge(paymentMethodUpdate.get(), *update);
    230232    [platformDelegate() completePaymentMethodSelection:paymentMethodUpdate.get()];
    231233}
    … …  
    250252        paymentSummaryItems:WebCore::platformSummaryItems(WTFMove(update->newTotal), WTFMove(update->newLineItems))
    251253        shippingMethods:toPKShippingMethods(WTFMove(update->newShippingMethods)).get()]);
    252 #if defined(PaymentAuthorizationPresenterAdditions_completeShippingContactSelection)
    253     PaymentAuthorizationPresenterAdditions_completeShippingContactSelection
    254 #endif
     254    merge(shippingContactUpdate.get(), *update);
    255255    [platformDelegate() completeShippingContactSelection:shippingContactUpdate.get()];
    256256}
    … …  
    268268    [shippingMethodUpdate setShippingMethods:toPKShippingMethods(WTFMove(update->newShippingMethods)).get()];
    269269#endif
    270 #if defined(PaymentAuthorizationPresenterAdditions_completeShippingMethodSelection)
    271     PaymentAuthorizationPresenterAdditions_completeShippingMethodSelection
    272 #endif
     270    merge(shippingMethodUpdate.get(), *update);
    273271    [platformDelegate() completeShippingMethodSelection:shippingMethodUpdate.get()];
    274272}
    … …  
    285283
    286284    auto couponCodeUpdate = adoptNS([PAL::allocPKPaymentRequestCouponCodeUpdateInstance() initWithErrors:toNSErrors(WTFMove(update->errors)).get() paymentSummaryItems:WebCore::platformSummaryItems(WTFMove(update->newTotal), WTFMove(update->newLineItems)) shippingMethods:toPKShippingMethods(WTFMove(update->newShippingMethods)).get()]);
    287 #if defined(PaymentAuthorizationPresenterAdditions_completeCouponCodeChange)
    288     PaymentAuthorizationPresenterAdditions_completeCouponCodeChange
    289 #endif
     285    merge(couponCodeUpdate.get(), *update);
    290286    [platformDelegate() completeCouponCodeChange:couponCodeUpdate.get()];
    291287}

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

    r278630 r282464  
    242242}
    243243
     244#if !USE(APPLE_INTERNAL_SDK)
     245static void merge(PKPaymentRequest *, const WebCore::ApplePaySessionPaymentRequest&) { }
     246#endif
     247
    244248RetainPtr<PKPaymentRequest> WebPaymentCoordinatorProxy::platformPaymentRequest(const URL& originatingURL, const Vector<URL>& linkIconURLs, const WebCore::ApplePaySessionPaymentRequest& paymentRequest)
    245249{
    … …  
    322326#endif
    323327
    324 #if defined(WebPaymentCoordinatorProxyCocoaAdditions_platformPaymentRequest)
    325     WebPaymentCoordinatorProxyCocoaAdditions_platformPaymentRequest
    326 #endif
     328    merge(result.get(), paymentRequest);
    327329
    328330    return result;
Note: See TracChangeset for help on using the changeset viewer.