Generate serialization for WebCore::TextRecognitionDataDetector

https://bugs.webkit.org/show_bug.cgi?id=267641 rdar://121125342 Reviewed by Alex Christensen. * Source/WebCore/platform/TextRecognitionResult.h: (WebCore::TextRecognitionDataDetector::TextRecognitionDataDetector): * Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm: (IPC::ArgumentCoder<WebCore::TextRecognitionDataDetector>::encodePlatformData): Deleted. (IPC::ArgumentCoder<WebCore::TextRecognitionDataDetector>::decodePlatformData): Deleted. * Source/WebKit/Shared/WebCoreArgumentCoders.cpp: (IPC::ArgumentCoder<TextRecognitionDataDetector>::encode): Deleted. (IPC::ArgumentCoder<TextRecognitionDataDetector>::decode): Deleted. * Source/WebKit/Shared/WebCoreArgumentCoders.h: * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: Canonical link: https://commits.webkit.org/273361@main
WebKit · Jan 23, 2024 · 74e3ec7 · 74e3ec7
1 parent 2887eed
commit 74e3ec7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 57 deletions.
diff --git a/Source/WebCore/platform/TextRecognitionResult.h b/Source/WebCore/platform/TextRecognitionResult.h
@@ -74,8 +74,8 @@ struct TextRecognitionLineData {
 
 struct TextRecognitionDataDetector {
     TextRecognitionDataDetector() = default;
-    TextRecognitionDataDetector(DDScannerResult *scannerResult, Vector<FloatQuad>&& quads)
-        : result(scannerResult)
+    TextRecognitionDataDetector(RetainPtr<DDScannerResult>&& scannerResult, Vector<FloatQuad>&& quads)
+        : result(WTFMove(scannerResult))
         , normalizedQuads(WTFMove(quads))
     {
     }

diff --git a/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm b/Source/WebKit/Shared/Cocoa/WebCoreArgumentCodersCocoa.mm
@@ -671,24 +671,6 @@
 }
 #endif
 
-#if ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
-
-void ArgumentCoder<WebCore::TextRecognitionDataDetector>::encodePlatformData(Encoder& encoder, const WebCore::TextRecognitionDataDetector& info)
-{
-    encoder << info.result.get();
-}
-
-bool ArgumentCoder<WebCore::TextRecognitionDataDetector>::decodePlatformData(Decoder& decoder, WebCore::TextRecognitionDataDetector& result)
-{
-    auto scannerResult = decoder.decodeWithAllowedClasses<DDScannerResult>();
-    if (!scannerResult)
-        return false;
-
-    result.result = WTFMove(*scannerResult);
-    return true;
-}
-
-#endif // ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
 
 #if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
 

diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
@@ -907,29 +907,4 @@ std::optional<WebCore::CDMInstanceSession::Message>  ArgumentCoder<WebCore::CDMI
 }
 #endif // ENABLE(ENCRYPTED_MEDIA)
 
-#if ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
-
-void ArgumentCoder<TextRecognitionDataDetector>::encode(Encoder& encoder, const TextRecognitionDataDetector& info)
-{
-    encodePlatformData(encoder, info);
-    encoder << info.normalizedQuads;
-}
-
-std::optional<TextRecognitionDataDetector> ArgumentCoder<TextRecognitionDataDetector>::decode(Decoder& decoder)
-{
-    TextRecognitionDataDetector result;
-    if (!decodePlatformData(decoder, result))
-        return std::nullopt;
-
-    std::optional<Vector<FloatQuad>> normalizedQuads;
-    decoder >> normalizedQuads;
-    if (!normalizedQuads)
-        return std::nullopt;
-
-    result.normalizedQuads = WTFMove(*normalizedQuads);
-    return WTFMove(result);
-}
-
-#endif // ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
-
 } // namespace IPC
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.h b/Source/WebKit/Shared/WebCoreArgumentCoders.h
@@ -127,7 +127,6 @@ class SystemImage;
 struct CompositionUnderline;
 struct DataDetectorElementInfo;
 struct SoupNetworkProxySettings;
-struct TextRecognitionDataDetector;
 struct ViewportArguments;
 
 template <class>
@@ -308,17 +307,6 @@ template<> struct ArgumentCoder<WebCore::CDMInstanceSession::Message> {
 };
 #endif
 
-#if ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
-
-template<> struct ArgumentCoder<WebCore::TextRecognitionDataDetector> {
-    static void encode(Encoder&, const WebCore::TextRecognitionDataDetector&);
-    static WARN_UNUSED_RETURN std::optional<WebCore::TextRecognitionDataDetector> decode(Decoder&);
-    static void encodePlatformData(Encoder&, const WebCore::TextRecognitionDataDetector&);
-    static WARN_UNUSED_RETURN bool decodePlatformData(Decoder&, WebCore::TextRecognitionDataDetector&);
-};
-
-#endif // ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
-
 #if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
 
 template<> struct ArgumentCoder<RetainPtr<VKCImageAnalysis>> {

diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
@@ -7284,6 +7284,14 @@ enum class WebCore::GraphicsContextGLSurfaceBuffer : bool;
     InvalidEnum
 };
 
+#if ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
+header: <WebCore/TextRecognitionResult.h>
+[CustomHeader] struct WebCore::TextRecognitionDataDetector {
+    RetainPtr<DDScannerResult> result;
+    Vector<WebCore::FloatQuad> normalizedQuads;
+};
+#endif // ENABLE(IMAGE_ANALYSIS) && ENABLE(DATA_DETECTION)
+
 #if ENABLE(VIDEO)
 
 header: <WebCore/AudioTrackPrivate.h>