Unreviewed, reverting r263094@main.

https://bugs.webkit.org/show_bug.cgi?id=255635 It broke Windows port Reverted changeset: "Plumb shape detection API to the GPU Process" https://bugs.webkit.org/show_bug.cgi?id=255473 https://commits.webkit.org/263094@main Canonical link: https://commits.webkit.org/263111@main
WebKit · Apr 19, 2023 · b801df7 · b801df7
1 parent 4dce328
commit b801df7
Show file tree

Hide file tree

Showing 87 changed files with 116 additions and 1,770 deletions.
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
@@ -1131,10 +1131,6 @@
 #define HAVE_WEBGPU_IMPLEMENTATION 1
 #endif
 
-#if PLATFORM(COCOA)
-#define HAVE_SHAPE_DETECTION_API_IMPLEMENTATION 1
-#endif
-
 #if HAVE(WEBGPU_IMPLEMENTATION) && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000))
 #define HAVE_METAL_BUFFER_BINDING_REFLECTION 1
 #endif

diff --git a/Source/WebCore/Headers.cmake b/Source/WebCore/Headers.cmake
@@ -1,20 +1,4 @@
 set(WebCore_PRIVATE_FRAMEWORK_HEADERS
-    Modules/ShapeDetection/Implementation/Cocoa/BarcodeDetectorImplementation.h
-    Modules/ShapeDetection/Implementation/Cocoa/FaceDetectorImplementation.h
-    Modules/ShapeDetection/Implementation/Cocoa/TextDetectorImplementation.h
-
-    Modules/ShapeDetection/Interfaces/BarcodeDetectorInterface.h
-    Modules/ShapeDetection/Interfaces/BarcodeDetectorOptionsInterface.h
-    Modules/ShapeDetection/Interfaces/BarcodeFormatInterface.h
-    Modules/ShapeDetection/Interfaces/DetectedBarcodeInterface.h
-    Modules/ShapeDetection/Interfaces/DetectedFaceInterface.h
-    Modules/ShapeDetection/Interfaces/DetectedTextInterface.h
-    Modules/ShapeDetection/Interfaces/FaceDetectorInterface.h
-    Modules/ShapeDetection/Interfaces/FaceDetectorOptionsInterface.h
-    Modules/ShapeDetection/Interfaces/LandmarkInterface.h
-    Modules/ShapeDetection/Interfaces/LandmarkTypeInterface.h
-    Modules/ShapeDetection/Interfaces/TextDetectorInterface.h
-
     Modules/WebGPU/GPU.h
     Modules/WebGPU/GPUAdapter.h
     Modules/WebGPU/GPUAddressMode.h

diff --git a/Source/WebCore/Modules/ShapeDetection/BarcodeDetector.cpp b/Source/WebCore/Modules/ShapeDetection/BarcodeDetector.cpp
@@ -28,36 +28,27 @@
 
 #include "BarcodeDetectorOptions.h"
 #include "BarcodeFormat.h"
-#include "Chrome.h"
 #include "DetectedBarcode.h"
-#include "Document.h"
 #include "JSDOMPromiseDeferred.h"
 #include "JSDetectedBarcode.h"
-#include "Page.h"
-#include "ScriptExecutionContext.h"
-#include "WorkerGlobalScope.h"
+
+#if PLATFORM(COCOA)
+// FIXME: Use the GPU Process.
+#include "BarcodeDetectorImplementation.h"
+#endif
 
 namespace WebCore {
 
-ExceptionOr<Ref<BarcodeDetector>> BarcodeDetector::create(ScriptExecutionContext& scriptExecutionContext, const BarcodeDetectorOptions& barcodeDetectorOptions)
+ExceptionOr<Ref<BarcodeDetector>> BarcodeDetector::create(const BarcodeDetectorOptions& barcodeDetectorOptions)
 {
-    if (is<Document>(scriptExecutionContext)) {
-        const auto& document = downcast<Document>(scriptExecutionContext);
-        const auto* page = document.page();
-        if (!page)
-            return Exception { AbortError };
-        auto backing = page->chrome().createBarcodeDetector(barcodeDetectorOptions.convertToBacking());
-        if (!backing)
-            return Exception { AbortError };
-        return adoptRef(*new BarcodeDetector(backing.releaseNonNull()));
-    }
-
-    if (is<WorkerGlobalScope>(scriptExecutionContext)) {
-        // FIXME: https://bugs.webkit.org/show_bug.cgi?id=255380 Make the Shape Detection API work in Workers
-        return Exception { AbortError };
-    }
-
+#if PLATFORM(COCOA)
+    // FIXME: Use the GPU Process.
+    auto backing = ShapeDetection::BarcodeDetectorImpl::create(barcodeDetectorOptions.convertToBacking());
+    return adoptRef(*new BarcodeDetector(WTFMove(backing)));
+#else
+    UNUSED_PARAM(barcodeDetectorOptions);
     return Exception { AbortError };
+#endif
 }
 
 
@@ -68,27 +59,18 @@ BarcodeDetector::BarcodeDetector(Ref<ShapeDetection::BarcodeDetector>&& backing)
 
 BarcodeDetector::~BarcodeDetector() = default;
 
-ExceptionOr<void> BarcodeDetector::getSupportedFormats(ScriptExecutionContext& scriptExecutionContext, GetSupportedFormatsPromise&& promise)
+void BarcodeDetector::getSupportedFormats(GetSupportedFormatsPromise&& promise)
 {
-    if (is<Document>(scriptExecutionContext)) {
-        const auto& document = downcast<Document>(scriptExecutionContext);
-        const auto* page = document.page();
-        if (!page)
-            return Exception { AbortError };
-        page->chrome().getBarcodeDetectorSupportedFormats(([promise = WTFMove(promise)](Vector<ShapeDetection::BarcodeFormat>&& barcodeFormats) mutable {
-            promise.resolve(barcodeFormats.map([](auto format) {
-                return convertFromBacking(format);
-            }));
+#if PLATFORM(COCOA)
+    // FIXME: Use the GPU Process.
+    ShapeDetection::BarcodeDetectorImpl::getSupportedFormats([promise = WTFMove(promise)](Vector<ShapeDetection::BarcodeFormat>&& barcodeFormats) mutable {
+        promise.resolve(barcodeFormats.map([](auto format) {
+            return convertFromBacking(format);
         }));
-        return { };
-    }
-
-    if (is<WorkerGlobalScope>(scriptExecutionContext)) {
-        // FIXME: https://bugs.webkit.org/show_bug.cgi?id=255380 Make the Shape Detection API work in Workers
-        return Exception { AbortError };
-    }
-
-    return Exception { AbortError };
+    });
+#else
+    promise.resolve({ });
+#endif
 }
 
 void BarcodeDetector::detect(const ImageBitmap::Source&, DetectPromise&& promise)

diff --git a/Source/WebCore/Modules/ShapeDetection/BarcodeDetector.h b/Source/WebCore/Modules/ShapeDetection/BarcodeDetector.h
@@ -37,16 +37,15 @@ namespace WebCore {
 struct BarcodeDetectorOptions;
 enum class BarcodeFormat : uint8_t;
 struct DetectedBarcode;
-class ScriptExecutionContext;
 
 class BarcodeDetector : public RefCounted<BarcodeDetector> {
 public:
-    static ExceptionOr<Ref<BarcodeDetector>> create(ScriptExecutionContext&, const BarcodeDetectorOptions&);
+    static ExceptionOr<Ref<BarcodeDetector>> create(const BarcodeDetectorOptions&);
 
     ~BarcodeDetector();
 
     using GetSupportedFormatsPromise = DOMPromiseDeferred<IDLSequence<IDLEnumeration<BarcodeFormat>>>;
-    static ExceptionOr<void> getSupportedFormats(ScriptExecutionContext&, GetSupportedFormatsPromise&&);
+    static void getSupportedFormats(GetSupportedFormatsPromise&&);
 
     using DetectPromise = DOMPromiseDeferred<IDLSequence<IDLDictionary<DetectedBarcode>>>;
     void detect(const ImageBitmap::Source&, DetectPromise&&);

diff --git a/Source/WebCore/Modules/ShapeDetection/BarcodeDetector.idl b/Source/WebCore/Modules/ShapeDetection/BarcodeDetector.idl
@@ -49,8 +49,8 @@ typedef (CanvasImageSource or Blob or ImageData) ImageBitmapSource;
     SecureContext
 ]
 interface BarcodeDetector {
-    [CallWith=CurrentScriptExecutionContext] constructor(optional BarcodeDetectorOptions barcodeDetectorOptions = {});
-    [CallWith=CurrentScriptExecutionContext] static Promise<sequence<BarcodeFormat>> getSupportedFormats();
+    constructor(optional BarcodeDetectorOptions barcodeDetectorOptions = {});
+    static Promise<sequence<BarcodeFormat>> getSupportedFormats();
 
     Promise<sequence<DetectedBarcode>> detect(ImageBitmapSource image);
 };
diff --git a/Source/WebCore/Modules/ShapeDetection/FaceDetector.cpp b/Source/WebCore/Modules/ShapeDetection/FaceDetector.cpp
@@ -26,37 +26,28 @@
 #include "config.h"
 #include "FaceDetector.h"
 
-#include "Chrome.h"
 #include "DetectedFace.h"
-#include "Document.h"
 #include "FaceDetectorOptions.h"
 #include "JSDOMPromiseDeferred.h"
 #include "JSDetectedFace.h"
-#include "Page.h"
-#include "ScriptExecutionContext.h"
-#include "WorkerGlobalScope.h"
+
+#if PLATFORM(COCOA)
+// FIXME: Use the GPU Process.
+#include "FaceDetectorImplementation.h"
+#endif
 
 namespace WebCore {
 
-ExceptionOr<Ref<FaceDetector>> FaceDetector::create(ScriptExecutionContext& scriptExecutionContext, const FaceDetectorOptions& faceDetectorOptions)
+ExceptionOr<Ref<FaceDetector>> FaceDetector::create(const FaceDetectorOptions& faceDetectorOptions)
 {
-    if (is<Document>(scriptExecutionContext)) {
-        const auto& document = downcast<Document>(scriptExecutionContext);
-        const auto* page = document.page();
-        if (!page)
-            return Exception { AbortError };
-        auto backing = page->chrome().createFaceDetector(faceDetectorOptions.convertToBacking());
-        if (!backing)
-            return Exception { AbortError };
-        return adoptRef(*new FaceDetector(backing.releaseNonNull()));
-    }
-
-    if (is<WorkerGlobalScope>(scriptExecutionContext)) {
-        // FIXME: https://bugs.webkit.org/show_bug.cgi?id=255380 Make the Shape Detection API work in Workers
-        return Exception { AbortError };
-    }
-
+#if PLATFORM(COCOA)
+    // FIXME: Use the GPU Process.
+    auto backing = ShapeDetection::FaceDetectorImpl::create(faceDetectorOptions.convertToBacking());
+    return adoptRef(*new FaceDetector(WTFMove(backing)));
+#else
+    UNUSED_PARAM(faceDetectorOptions);
     return Exception { AbortError };
+#endif
 }
 
 FaceDetector::FaceDetector(Ref<ShapeDetection::FaceDetector>&& backing)

diff --git a/Source/WebCore/Modules/ShapeDetection/FaceDetector.h b/Source/WebCore/Modules/ShapeDetection/FaceDetector.h
@@ -36,11 +36,10 @@ namespace WebCore {
 
 struct FaceDetectorOptions;
 struct DetectedFace;
-class ScriptExecutionContext;
 
 class FaceDetector : public RefCounted<FaceDetector> {
 public:
-    static ExceptionOr<Ref<FaceDetector>> create(ScriptExecutionContext&, const FaceDetectorOptions&);
+    static ExceptionOr<Ref<FaceDetector>> create(const FaceDetectorOptions&);
 
     ~FaceDetector();
 

diff --git a/Source/WebCore/Modules/ShapeDetection/FaceDetector.idl b/Source/WebCore/Modules/ShapeDetection/FaceDetector.idl
@@ -49,6 +49,6 @@ typedef (CanvasImageSource or Blob or ImageData) ImageBitmapSource;
     SecureContext
 ]
 interface FaceDetector {
-    [CallWith=CurrentScriptExecutionContext] constructor(optional FaceDetectorOptions faceDetectorOptions = {});
+    constructor(optional FaceDetectorOptions faceDetectorOptions = {});
     Promise<sequence<DetectedFace>> detect(ImageBitmapSource image);
 };
diff --git a/Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/BarcodeDetectorImplementation.h b/Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/BarcodeDetectorImplementation.h
@@ -41,10 +41,10 @@ class BarcodeDetectorImpl final : public BarcodeDetector {
 
     virtual ~BarcodeDetectorImpl();
 
-    WEBCORE_EXPORT static void getSupportedFormats(CompletionHandler<void(Vector<BarcodeFormat>&&)>&&);
+    static void getSupportedFormats(CompletionHandler<void(Vector<BarcodeFormat>&&)>&&);
 
 private:
-    WEBCORE_EXPORT BarcodeDetectorImpl(const BarcodeDetectorOptions&);
+    BarcodeDetectorImpl(const BarcodeDetectorOptions&);
 
     BarcodeDetectorImpl(const BarcodeDetectorImpl&) = delete;
     BarcodeDetectorImpl(BarcodeDetectorImpl&&) = delete;

diff --git a/Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/FaceDetectorImplementation.h b/Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/FaceDetectorImplementation.h
@@ -42,7 +42,7 @@ class FaceDetectorImpl final : public FaceDetector {
     virtual ~FaceDetectorImpl();
 
 private:
-    WEBCORE_EXPORT FaceDetectorImpl(const FaceDetectorOptions&);
+    FaceDetectorImpl(const FaceDetectorOptions&);
 
     FaceDetectorImpl(const FaceDetectorImpl&) = delete;
     FaceDetectorImpl(FaceDetectorImpl&&) = delete;

diff --git a/Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/TextDetectorImplementation.h b/Source/WebCore/Modules/ShapeDetection/Implementation/Cocoa/TextDetectorImplementation.h
@@ -40,7 +40,7 @@ class TextDetectorImpl final : public TextDetector {
     virtual ~TextDetectorImpl();
 
 private:
-    WEBCORE_EXPORT TextDetectorImpl();
+    TextDetectorImpl();
 
     TextDetectorImpl(const TextDetectorImpl&) = delete;
     TextDetectorImpl(TextDetectorImpl&&) = delete;

diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/BarcodeDetectorOptionsInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/BarcodeDetectorOptionsInterface.h
@@ -25,11 +25,12 @@
 
 #pragma once
 
-#include "BarcodeFormatInterface.h"
 #include <wtf/Vector.h>
 
 namespace WebCore::ShapeDetection {
 
+enum class BarcodeFormat : uint8_t;
+
 struct BarcodeDetectorOptions {
     Vector<BarcodeFormat> formats;
 };

diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/BarcodeFormatInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/BarcodeFormatInterface.h
@@ -26,7 +26,6 @@
 #pragma once
 
 #include <cstdint>
-#include <wtf/EnumTraits.h>
 
 namespace WebCore::ShapeDetection {
 
@@ -48,27 +47,3 @@ enum class BarcodeFormat : uint8_t {
 };
 
 } // namespace WebCore::ShapeDetection
-
-namespace WTF {
-
-template<> struct EnumTraits<WebCore::ShapeDetection::BarcodeFormat> {
-    using values = EnumValues<
-        WebCore::ShapeDetection::BarcodeFormat,
-        WebCore::ShapeDetection::BarcodeFormat::Aztec,
-        WebCore::ShapeDetection::BarcodeFormat::Code_128,
-        WebCore::ShapeDetection::BarcodeFormat::Code_39,
-        WebCore::ShapeDetection::BarcodeFormat::Code_93,
-        WebCore::ShapeDetection::BarcodeFormat::Codabar,
-        WebCore::ShapeDetection::BarcodeFormat::Data_matrix,
-        WebCore::ShapeDetection::BarcodeFormat::Ean_13,
-        WebCore::ShapeDetection::BarcodeFormat::Ean_8,
-        WebCore::ShapeDetection::BarcodeFormat::Itf,
-        WebCore::ShapeDetection::BarcodeFormat::Pdf417,
-        WebCore::ShapeDetection::BarcodeFormat::Qr_code,
-        WebCore::ShapeDetection::BarcodeFormat::Unknown,
-        WebCore::ShapeDetection::BarcodeFormat::Upc_a,
-        WebCore::ShapeDetection::BarcodeFormat::Upc_e
-    >;
-};
-
-} // namespace WTF
diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/DetectedBarcodeInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/DetectedBarcodeInterface.h
@@ -25,12 +25,15 @@
 
 #pragma once
 
-#include "BarcodeFormatInterface.h"
-#include "FloatPoint.h"
+#include "BarcodeFormat.h"
 #include "FloatRect.h"
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
+namespace WebCore {
+class FloatPoint;
+}
+
 namespace WebCore::ShapeDetection {
 
 struct DetectedBarcode {

diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/DetectedFaceInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/DetectedFaceInterface.h
@@ -26,12 +26,13 @@
 #pragma once
 
 #include "FloatRect.h"
-#include "LandmarkInterface.h"
 #include <optional>
 #include <wtf/Vector.h>
 
 namespace WebCore::ShapeDetection {
 
+struct Landmark;
+
 struct DetectedFace {
     FloatRect boundingBox;
     std::optional<Vector<Landmark>> landmarks;

diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/DetectedTextInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/DetectedTextInterface.h
@@ -25,11 +25,14 @@
 
 #pragma once
 
-#include "FloatPoint.h"
 #include "FloatRect.h"
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
+namespace WebCore {
+class FloatPoint;
+}
+
 namespace WebCore::ShapeDetection {
 
 struct DetectedText {

diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/LandmarkInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/LandmarkInterface.h
@@ -25,10 +25,13 @@
 
 #pragma once
 
-#include "FloatPoint.h"
-#include "LandmarkTypeInterface.h"
+#include "LandmarkType.h"
 #include <wtf/Vector.h>
 
+namespace WebCore {
+class FloatPoint;
+}
+
 namespace WebCore::ShapeDetection {
 
 struct Landmark {

diff --git a/Source/WebCore/Modules/ShapeDetection/Interfaces/LandmarkTypeInterface.h b/Source/WebCore/Modules/ShapeDetection/Interfaces/LandmarkTypeInterface.h
@@ -26,7 +26,6 @@
 #pragma once
 
 #include <cstdint>
-#include <wtf/EnumTraits.h>
 
 namespace WebCore::ShapeDetection {
 
@@ -37,17 +36,3 @@ enum class LandmarkType : uint8_t {
 };
 
 } // namespace WebCore::ShapeDetection
-
-namespace WTF {
-
-template<> struct EnumTraits<WebCore::ShapeDetection::LandmarkType> {
-    using values = EnumValues<
-        WebCore::ShapeDetection::LandmarkType,
-        WebCore::ShapeDetection::LandmarkType::Mouth,
-        WebCore::ShapeDetection::LandmarkType::Eye,
-        WebCore::ShapeDetection::LandmarkType::Nose
-    >;
-};
-
-} // namespace WTF
-