Unreviewed, revert 274702@main

https://bugs.webkit.org/show_bug.cgi?id=269463 rdar://115776022 Broke internal builds. * LayoutTests/http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https-expected.txt: Removed. * LayoutTests/http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https.html: Removed. * LayoutTests/platform/ios-wk2/TestExpectations: * LayoutTests/platform/mac-wk2/TestExpectations: * Source/WTF/wtf/PlatformEnableCocoa.h: * Source/WebCore/DerivedSources-input.xcfilelist: * Source/WebCore/DerivedSources-output.xcfilelist: * Source/WebCore/DerivedSources.make: * Source/WebCore/Modules/applepay/ApplePayDetailsUpdateBase.h: * Source/WebCore/Modules/applepay/ApplePayDetailsUpdateBase.idl: * Source/WebCore/Modules/applepay/ApplePayDisbursementPaymentRequest.h: Removed. * Source/WebCore/Modules/applepay/ApplePayDisbursementPaymentRequest.idl: Removed. * Source/WebCore/Modules/applepay/ApplePayFeature.h: * Source/WebCore/Modules/applepay/ApplePayFeature.idl: * Source/WebCore/Modules/applepay/ApplePayLineItem.h: * Source/WebCore/Modules/applepay/ApplePayLineItem.idl: * Source/WebCore/Modules/applepay/ApplePayMerchantCapability.cpp: (WebCore::convertAndValidate): * Source/WebCore/Modules/applepay/ApplePayMerchantCapability.h: * Source/WebCore/Modules/applepay/ApplePayMerchantCapability.idl: * Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h: * Source/WebCore/Modules/applepay/ApplePayPaymentRequest.idl: * Source/WebCore/Modules/applepay/ApplePaySession.cpp: (WebCore::convertAndValidate): * Source/WebCore/Modules/applepay/ApplePaySessionPaymentRequest.h: (WebCore::ApplePaySessionPaymentRequest::disbursementPaymentRequest const): Deleted. (WebCore::ApplePaySessionPaymentRequest::setDisbursementPaymentRequest): Deleted. * Source/WebCore/Modules/applepay/PaymentSummaryItems.h: * Source/WebCore/Modules/applepay/cocoa/PaymentSummaryItemsCocoa.mm: (WebCore::platformSummaryItem): (WebCore::platformDisbursementSummaryItem): Deleted. (WebCore::platformInstantFundsOutFeeSummaryItem): Deleted. (WebCore::platformDisbursementSummaryItems): Deleted. * Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.h: * Source/WebCore/Modules/applepay/paymentrequest/ApplePayModifier.idl: * Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp: (WebCore::ApplePayPaymentHandler::show): (WebCore::ApplePayPaymentHandler::shippingAddressUpdated): (WebCore::ApplePayPaymentHandler::shippingOptionUpdated): (WebCore::ApplePayPaymentHandler::paymentMethodUpdated): * Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.h: * Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.mm: * Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h: * Source/WebCore/SourcesCocoa.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/testing/MockPaymentCoordinator.cpp: (WebCore::MockPaymentCoordinator::showPaymentUI): (WebCore::MockPaymentCoordinator::completeShippingMethodSelection): (WebCore::MockPaymentCoordinator::completeShippingContactSelection): (WebCore::MockPaymentCoordinator::completePaymentMethodSelection): * Source/WebCore/testing/MockPaymentCoordinator.h: * Source/WebCore/testing/MockPaymentCoordinator.idl: * Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm: (WebKit::PaymentAuthorizationPresenter::completePaymentMethodSelection): (WebKit::PaymentAuthorizationPresenter::completeShippingContactSelection): * Source/WebKit/Shared/ApplePay/DisbursementPaymentRequest.h: Removed. * Source/WebKit/Shared/ApplePay/cocoa/DisbursementPaymentRequestCocoa.mm: Removed. * Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.h: * Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm: (WebKit::toPKMerchantCapabilities): * Source/WebKit/Shared/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm: (WebKit::WebPaymentCoordinatorProxy::platformShowPaymentUI): * Source/WebKit/Shared/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm: (WebKit::WebPaymentCoordinatorProxy::platformShowPaymentUI): * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: * Source/WebKit/SourcesCocoa.txt: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: Canonical link: https://commits.webkit.org/274731@main
WebKit · Feb 15, 2024 · 49300ec · 49300ec
1 parent f270bdb
commit 49300ec
Show file tree

Hide file tree

Showing 46 changed files with 16 additions and 688 deletions.
diff --git a/.../http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https-expected.txt b/.../http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https-expected.txt
diff --git a/LayoutTests/http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https.html b/LayoutTests/http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https.html
diff --git a/LayoutTests/platform/ios-wk2/TestExpectations b/LayoutTests/platform/ios-wk2/TestExpectations
@@ -83,7 +83,6 @@ accessibility/ios-simulator/image-overlay-elements.html [ Pass ]
 http/tests/ssl/applepay [ Pass ]
 webkit.org/b/212975 http/tests/ssl/applepay/PaymentRequest.https.html [ Pass Timeout ]
 
-http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https.html [ Skip ]
 http/tests/paymentrequest [ Pass ]
 imported/w3c/web-platform-tests/payment-request [ Pass ]
 webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]

diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -66,7 +66,6 @@ fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html  [ Pass ]
 
 webkit.org/b/229423 [ BigSur Debug arm64 ] http/tests/paymentrequest/payment-response-reference-cycle-leak.https.html [ Pass Crash ]
 
-http/tests/paymentrequest/ApplePayModifier-disbursementPaymentRequest.https.html [ Skip ]
 http/tests/paymentrequest [ Pass ]
 http/tests/inspector/paymentrequest [ Pass ]
 imported/w3c/web-platform-tests/payment-request [ Pass ]

diff --git a/Source/WTF/wtf/PlatformEnableCocoa.h b/Source/WTF/wtf/PlatformEnableCocoa.h
@@ -164,10 +164,6 @@
 #define ENABLE_APPLE_PAY_DEFERRED_PAYMENTS 1
 #endif
 
-#if !defined(ENABLE_APPLE_PAY_DISBURSEMENTS) && HAVE(PASSKIT_DISBURSEMENTS)
-#define ENABLE_APPLE_PAY_DISBURSEMENTS 1
-#endif
-
 #if !PLATFORM(MAC) && !PLATFORM(MACCATALYST) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
 
 #if !defined(ENABLE_APPLE_PAY_REMOTE_UI)

diff --git a/Source/WebCore/DerivedSources-input.xcfilelist b/Source/WebCore/DerivedSources-input.xcfilelist
@@ -345,7 +345,6 @@ $(PROJECT_DIR)/Modules/applepay/ApplePayCouponCodeUpdate.idl
 $(PROJECT_DIR)/Modules/applepay/ApplePayDateComponents.idl
 $(PROJECT_DIR)/Modules/applepay/ApplePayDateComponentsRange.idl
 $(PROJECT_DIR)/Modules/applepay/ApplePayDeferredPaymentRequest.idl
-$(PROJECT_DIR)/Modules/applepay/ApplePayDisbursementPaymentRequest.idl
 $(PROJECT_DIR)/Modules/applepay/ApplePayDetailsUpdateBase.idl
 $(PROJECT_DIR)/Modules/applepay/ApplePayError.idl
 $(PROJECT_DIR)/Modules/applepay/ApplePayErrorCode.idl

diff --git a/Source/WebCore/DerivedSources-output.xcfilelist b/Source/WebCore/DerivedSources-output.xcfilelist
@@ -123,8 +123,6 @@ $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayDeferredPaymentRequest.cp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayDeferredPaymentRequest.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayDetailsUpdateBase.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayDetailsUpdateBase.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayDisbursementPaymentRequest.cpp
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayDisbursementPaymentRequest.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayError.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayError.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/JSApplePayErrorCode.cpp

diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
@@ -220,7 +220,6 @@ JS_BINDING_IDLS := \
     $(WebCore)/Modules/applepay/ApplePayDateComponents.idl \
     $(WebCore)/Modules/applepay/ApplePayDateComponentsRange.idl \
     $(WebCore)/Modules/applepay/ApplePayDeferredPaymentRequest.idl \
-    $(WebCore)/Modules/applepay/ApplePayDisbursementPaymentRequest.idl \
     $(WebCore)/Modules/applepay/ApplePayDetailsUpdateBase.idl \
     $(WebCore)/Modules/applepay/ApplePayError.idl \
     $(WebCore)/Modules/applepay/ApplePayErrorCode.idl \

diff --git a/Source/WebCore/Modules/applepay/ApplePayDetailsUpdateBase.h b/Source/WebCore/Modules/applepay/ApplePayDetailsUpdateBase.h
@@ -29,7 +29,6 @@
 
 #include "ApplePayAutomaticReloadPaymentRequest.h"
 #include "ApplePayDeferredPaymentRequest.h"
-#include "ApplePayDisbursementPaymentRequest.h"
 #include "ApplePayLineItem.h"
 #include "ApplePayPaymentTokenContext.h"
 #include "ApplePayRecurringPaymentRequest.h"
@@ -56,10 +55,6 @@ struct ApplePayDetailsUpdateBase {
 #if ENABLE(APPLE_PAY_DEFERRED_PAYMENTS)
     std::optional<ApplePayDeferredPaymentRequest> newDeferredPaymentRequest;
 #endif
-
-#if ENABLE(APPLE_PAY_DISBURSEMENTS)
-    std::optional<ApplePayDisbursementPaymentRequest> newDisbursementPaymentRequest;
-#endif
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/Modules/applepay/ApplePayDetailsUpdateBase.idl b/Source/WebCore/Modules/applepay/ApplePayDetailsUpdateBase.idl
@@ -36,6 +36,4 @@
     [Conditional=APPLE_PAY_MULTI_MERCHANT_PAYMENTS] sequence<ApplePayPaymentTokenContext> newMultiTokenContexts;
 
     [Conditional=APPLE_PAY_DEFERRED_PAYMENTS] ApplePayDeferredPaymentRequest newDeferredPaymentRequest;
-
-    [Conditional=APPLE_PAY_DISBURSEMENTS] ApplePayDisbursementPaymentRequest newDisbursementPaymentRequest;
 };
diff --git a/Source/WebCore/Modules/applepay/ApplePayDisbursementPaymentRequest.h b/Source/WebCore/Modules/applepay/ApplePayDisbursementPaymentRequest.h
diff --git a/Source/WebCore/Modules/applepay/ApplePayDisbursementPaymentRequest.idl b/Source/WebCore/Modules/applepay/ApplePayDisbursementPaymentRequest.idl
diff --git a/Source/WebCore/Modules/applepay/ApplePayFeature.h b/Source/WebCore/Modules/applepay/ApplePayFeature.h
@@ -75,9 +75,6 @@ enum class ApplePayFeature : uint8_t {
 #if ENABLE(APPLE_PAY_SHIPPING_METHOD_DATE_COMPONENTS_RANGE)
     ShippingMethodDateComponentsRange,
 #endif
-#if ENABLE(APPLE_PAY_DISBURSEMENTS)
-    PaymentRequestDisbursements,
-#endif
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/Modules/applepay/ApplePayFeature.idl b/Source/WebCore/Modules/applepay/ApplePayFeature.idl
@@ -71,7 +71,4 @@
 #if defined(ENABLE_APPLE_PAY_SHIPPING_METHOD_DATE_COMPONENTS_RANGE) && ENABLE_APPLE_PAY_SHIPPING_METHOD_DATE_COMPONENTS_RANGE
     , "shippingMethodDateComponentsRange"
 #endif
-#if defined(ENABLE_APPLE_PAY_DISBURSEMENTS) && ENABLE_APPLE_PAY_DISBURSEMENTS
-    , "paymentRequestDisbursements"
-#endif
 };
diff --git a/Source/WebCore/Modules/applepay/ApplePayLineItem.h b/Source/WebCore/Modules/applepay/ApplePayLineItem.h
@@ -61,18 +61,6 @@ struct ApplePayLineItem final {
 #if ENABLE(APPLE_PAY_AUTOMATIC_RELOAD_LINE_ITEM)
     String automaticReloadPaymentThresholdAmount; /* required */
 #endif
-
-#if ENABLE(APPLE_PAY_DISBURSEMENTS)
-
-    enum class DisbursementLineItemType : uint8_t {
-        Disbursement,
-        InstantFundsOutFee,
-    };
-
-    std::optional<DisbursementLineItemType> disbursementLineItemType;
-
-#endif
-
 };
 
 } // namespace WebCore

diff --git a/Source/WebCore/Modules/applepay/ApplePayLineItem.idl b/Source/WebCore/Modules/applepay/ApplePayLineItem.idl
@@ -30,13 +30,6 @@
     "final"
 };
 
-[
-    Conditional=APPLE_PAY_DISBURSEMENTS,
-] enum ApplePayDisbursementLineItemType {
-    "disbursement",
-    "instantFundsOutFee"
-};
-
 [
     Conditional=APPLE_PAY,
     ExportMacro=WEBCORE_EXPORT,
@@ -56,6 +49,4 @@
     [Conditional=APPLE_PAY_DEFERRED_LINE_ITEM] Date deferredPaymentDate;
 
     [Conditional=APPLE_PAY_AUTOMATIC_RELOAD_LINE_ITEM] DOMString automaticReloadPaymentThresholdAmount; // required
-
-    [Conditional=APPLE_PAY_DISBURSEMENTS] ApplePayDisbursementLineItemType disbursementLineItemType;
 };
diff --git a/Source/WebCore/Modules/applepay/ApplePayMerchantCapability.cpp b/Source/WebCore/Modules/applepay/ApplePayMerchantCapability.cpp
@@ -51,11 +51,6 @@ ExceptionOr<ApplePaySessionPaymentRequest::MerchantCapabilities> convertAndValid
         case ApplePayMerchantCapability::SupportsDebit:
             result.supportsDebit = true;
             break;
-#if ENABLE(APPLE_PAY_DISBURSEMENTS)
-        case ApplePayMerchantCapability::SupportsInstantFundsOut:
-            result.supportsInstantFundsOut = true;
-            break;
-#endif
         }
     }
 

diff --git a/Source/WebCore/Modules/applepay/ApplePayMerchantCapability.h b/Source/WebCore/Modules/applepay/ApplePayMerchantCapability.h
@@ -37,9 +37,6 @@ enum class ApplePayMerchantCapability {
     SupportsEMV,
     SupportsCredit,
     SupportsDebit,
-#if ENABLE(APPLE_PAY_DISBURSEMENTS)
-    SupportsInstantFundsOut
-#endif
 };
 
 ExceptionOr<ApplePaySessionPaymentRequest::MerchantCapabilities> convertAndValidate(const Vector<ApplePayMerchantCapability>&);

diff --git a/Source/WebCore/Modules/applepay/ApplePayMerchantCapability.idl b/Source/WebCore/Modules/applepay/ApplePayMerchantCapability.idl
@@ -29,8 +29,5 @@
     "supports3DS",
     "supportsEMV",
     "supportsCredit",
-    "supportsDebit",
-#if defined(ENABLE_APPLE_PAY_DISBURSEMENTS) && ENABLE_APPLE_PAY_DISBURSEMENTS
-    "supportsInstantFundsOut"
-#endif
+    "supportsDebit"
 };
diff --git a/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h b/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.h
@@ -29,7 +29,6 @@
 
 #include "ApplePayAutomaticReloadPaymentRequest.h"
 #include "ApplePayDeferredPaymentRequest.h"
-#include "ApplePayDisbursementPaymentRequest.h"
 #include "ApplePayLineItem.h"
 #include "ApplePayPaymentContact.h"
 #include "ApplePayPaymentTokenContext.h"
@@ -66,10 +65,6 @@ struct ApplePayPaymentRequest : ApplePayRequestBase {
 #if ENABLE(APPLE_PAY_DEFERRED_PAYMENTS)
     std::optional<ApplePayDeferredPaymentRequest> deferredPaymentRequest;
 #endif
-
-#if ENABLE(APPLE_PAY_DISBURSEMENTS)
-    std::optional<ApplePayDisbursementPaymentRequest> disbursementPaymentRequest;
-#endif
 };
 
 }

diff --git a/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.idl b/Source/WebCore/Modules/applepay/ApplePayPaymentRequest.idl
@@ -50,7 +50,4 @@
     [Conditional=APPLE_PAY_MULTI_MERCHANT_PAYMENTS] sequence<ApplePayPaymentTokenContext> multiTokenContexts;
 
     [Conditional=APPLE_PAY_DEFERRED_PAYMENTS] ApplePayDeferredPaymentRequest deferredPaymentRequest;
-
-    [Conditional=APPLE_PAY_DISBURSEMENTS] ApplePayDisbursementPaymentRequest disbursementPaymentRequest;
-
 };