Generate serialization for WebCore::PaymentSessionError

https://bugs.webkit.org/show_bug.cgi?id=267744 rdar://121226874 Reviewed by Alex Christensen. * Source/WebCore/Modules/applepay/PaymentSessionError.h: * Source/WebCore/Modules/applepay/cocoa/PaymentSessionErrorCocoa.mm: (WebCore::PaymentSessionError::platformError const): * Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm: (IPC::ArgumentCoder<WebCore::PaymentSessionError>::encode): Deleted. (IPC::ArgumentCoder<WebCore::PaymentSessionError>::decode): Deleted. * Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.serialization.in: * Source/WebKit/Shared/WebCoreArgumentCoders.h: Canonical link: https://commits.webkit.org/273511@main
WebKit · Jan 25, 2024 · 7abb62b · 7abb62b
1 parent a98855c
commit 7abb62b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 22 deletions.
diff --git a/Source/WebCore/Modules/applepay/PaymentSessionError.h b/Source/WebCore/Modules/applepay/PaymentSessionError.h
@@ -41,7 +41,7 @@ class WEBCORE_EXPORT PaymentSessionError {
     PaymentSessionError(RetainPtr<NSError>&&);
 
     ApplePaySessionError sessionError() const;
-    NSError *platformError() const;
+    RetainPtr<NSError> platformError() const;
 
 private:
     ApplePaySessionError unknownError() const;

diff --git a/Source/WebCore/Modules/applepay/cocoa/PaymentSessionErrorCocoa.mm b/Source/WebCore/Modules/applepay/cocoa/PaymentSessionErrorCocoa.mm
@@ -68,9 +68,9 @@
     return unknownError();
 }
 
-NSError *PaymentSessionError::platformError() const
+RetainPtr<NSError> PaymentSessionError::platformError() const
 {
-    return m_platformError.get();
+    return m_platformError;
 }
 
 ApplePaySessionError PaymentSessionError::unknownError() const

diff --git a/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm b/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
@@ -382,20 +382,6 @@
     return true;
 }
 
-void ArgumentCoder<WebCore::PaymentSessionError>::encode(Encoder& encoder, const WebCore::PaymentSessionError& error)
-{
-    encoder << error.platformError();
-}
-
-std::optional<WebCore::PaymentSessionError> ArgumentCoder<WebCore::PaymentSessionError>::decode(Decoder& decoder)
-{
-    auto platformError = decoder.decode<RetainPtr<NSError>>();
-    if (!platformError)
-        return std::nullopt;
-
-    return { WTFMove(*platformError) };
-}
-
 #endif // ENABLE(APPLEPAY)
 
 void ArgumentCoder<WebCore::Font>::encodePlatformData(Encoder& encoder, const WebCore::Font& font)

diff --git a/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.serialization.in b/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.serialization.in
@@ -110,6 +110,10 @@ enum class WebCore::ApplePaySessionPaymentRequestShippingType : uint8_t {
     ServicePickup,
 };
 
+class WebCore::PaymentSessionError {
+    [SecureCodingAllowed=[NSError.class]] RetainPtr<NSError> platformError();
+};
+
 headers: <pal/cocoa/PassKitSoftLink.h>
 class WebCore::PaymentMethod {
     [Precondition='PAL::isPassKitCoreFrameworkAvailable()', SecureCodingAllowed=[PAL::getPKPaymentMethodClass()], Validator='m_pkPaymentMethod'] RetainPtr<PKPaymentMethod> m_pkPaymentMethod;

diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.h b/Source/WebKit/Shared/WebCoreArgumentCoders.h
@@ -249,11 +249,6 @@ template<> struct ArgumentCoder<WebCore::ApplePaySessionPaymentRequest::Merchant
     static WARN_UNUSED_RETURN bool decode(Decoder&, WebCore::ApplePaySessionPaymentRequest::MerchantCapabilities&);
 };
 
-template<> struct ArgumentCoder<WebCore::PaymentSessionError> {
-    static void encode(Encoder&, const WebCore::PaymentSessionError&);
-    static std::optional<WebCore::PaymentSessionError> decode(Decoder&);
-};
-
 #endif
 
 #if ENABLE(VIDEO)