| Index: third_party/WebKit/Source/modules/shapedetection/FaceDetector.h
|
| diff --git a/third_party/WebKit/Source/modules/shapedetection/FaceDetector.h b/third_party/WebKit/Source/modules/shapedetection/FaceDetector.h
|
| index 61906cb473459a1a40d5616eb64958231e198edb..e16c8cc061bb07db6e0885824cb4992911a6e97d 100644
|
| --- a/third_party/WebKit/Source/modules/shapedetection/FaceDetector.h
|
| +++ b/third_party/WebKit/Source/modules/shapedetection/FaceDetector.h
|
| @@ -10,42 +10,26 @@
|
| #include "bindings/core/v8/ScriptWrappable.h"
|
| #include "modules/ModulesExport.h"
|
| #include "modules/canvas2d/CanvasRenderingContext2D.h"
|
| +#include "modules/shapedetection/ShapeDetector.h"
|
| #include "public/platform/modules/shapedetection/shapedetection.mojom-blink.h"
|
|
|
| namespace blink {
|
|
|
| class LocalFrame;
|
|
|
| -class MODULES_EXPORT FaceDetector final
|
| - : public GarbageCollectedFinalized<FaceDetector>,
|
| - public ScriptWrappable {
|
| +class MODULES_EXPORT FaceDetector final : public ShapeDetector,
|
| + public ScriptWrappable {
|
| DEFINE_WRAPPERTYPEINFO();
|
|
|
| public:
|
| static FaceDetector* create(ScriptState*);
|
|
|
| ScriptPromise detect(ScriptState*, const CanvasImageSourceUnion&);
|
| - DECLARE_TRACE();
|
| + DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| explicit FaceDetector(LocalFrame&);
|
| - ScriptPromise detectFacesOnImageElement(ScriptPromiseResolver*,
|
| - const HTMLImageElement*);
|
| - ScriptPromise detectFacesOnImageBitmap(ScriptPromiseResolver*, ImageBitmap*);
|
| - ScriptPromise detectFacesOnVideoElement(ScriptPromiseResolver*,
|
| - const HTMLVideoElement*);
|
| -
|
| - ScriptPromise detectFacesOnData(ScriptPromiseResolver*,
|
| - uint8_t* data,
|
| - int size,
|
| - int width,
|
| - int height);
|
| - void onDetectFace(ScriptPromiseResolver*,
|
| - mojom::blink::FaceDetectionResultPtr);
|
| -
|
| - mojom::blink::ShapeDetectionPtr m_service;
|
| -
|
| - HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
|
| + ~FaceDetector() override = default;
|
| };
|
|
|
| } // namespace blink
|
|
|