ShapeDetection: Eliminate DetectorType enum in ShapeDetector.cpp

third_party/WebKit/Source/modules/shapedetection/ShapeDetector.h

Index: third_party/WebKit/Source/modules/shapedetection/ShapeDetector.h
diff --git a/third_party/WebKit/Source/modules/shapedetection/ShapeDetector.h b/third_party/WebKit/Source/modules/shapedetection/ShapeDetector.h
index 744007a8d8427dc3bf74b48b16217f40e533d5a3..6a5ce62f059ba1924e4b07d64d6c0f5e104704a7 100644
--- a/third_party/WebKit/Source/modules/shapedetection/ShapeDetector.h
+++ b/third_party/WebKit/Source/modules/shapedetection/ShapeDetector.h
@@ -9,9 +9,6 @@
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "modules/ModulesExport.h"
 #include "modules/canvas2d/CanvasRenderingContext2D.h"
-#include "modules/shapedetection/FaceDetectorOptions.h"
-#include "public/platform/modules/shapedetection/barcodedetection.mojom-blink.h"
-#include "public/platform/modules/shapedetection/facedetection.mojom-blink.h"
 
 namespace blink {
 
@@ -20,55 +17,28 @@ class LocalFrame;
 class MODULES_EXPORT ShapeDetector
     : public GarbageCollectedFinalized<ShapeDetector> {
  public:
-  enum class DetectorType {
-    Face,
-    Barcode
-    // TODO(mcasas): Implement TextDetector after
-    // https://github.com/WICG/shape-detection-api/issues/6
-  };
+  // TODO(mcasas): Implement TextDetector after
+  // https://github.com/WICG/shape-detection-api/issues/6
   explicit ShapeDetector(LocalFrame&);
-  ShapeDetector(LocalFrame&, const FaceDetectorOptions&);
   virtual ~ShapeDetector() = default;
 
+  ScriptPromise detect(ScriptState*, const CanvasImageSourceUnion&);
   ScriptPromise detectShapes(ScriptState*,
-                             DetectorType,
+                             ScriptPromiseResolver*,
                              const CanvasImageSourceUnion&);
-  DECLARE_VIRTUAL_TRACE();
+  DEFINE_INLINE_VIRTUAL_TRACE() {}
 
  private:
-  ScriptPromise detectShapesOnImageElement(DetectorType,
-                                           ScriptPromiseResolver*,
+  ScriptPromise detectShapesOnImageElement(ScriptPromiseResolver*,
                                            const HTMLImageElement*);
-  ScriptPromise detectShapesOnImageBitmap(DetectorType,
-                                          ScriptPromiseResolver*,
-                                          ImageBitmap*);
-  ScriptPromise detectShapesOnVideoElement(DetectorType,
-                                           ScriptPromiseResolver*,
+  ScriptPromise detectShapesOnImageBitmap(ScriptPromiseResolver*, ImageBitmap*);
+  ScriptPromise detectShapesOnVideoElement(ScriptPromiseResolver*,
                                            const HTMLVideoElement*);
 
-  ScriptPromise detectShapesOnData(DetectorType,
-                                   ScriptPromiseResolver*,
-                                   uint8_t* data,
-                                   int size,
-                                   int width,
-                                   int height);
-  void onDetectFaces(ScriptPromiseResolver*,
-                     mojom::blink::FaceDetectionResultPtr);
-  void onDetectBarcodes(ScriptPromiseResolver*,
-                        Vector<mojom::blink::BarcodeDetectionResultPtr>);
-
-  // Error handlers for use if mojo service doesn't connect.
-  void onFaceServiceConnectionError();
-  void onBarcodeServiceConnectionError();
-
-  mojom::blink::FaceDetectionPtr m_faceService;
-  mojom::blink::BarcodeDetectionPtr m_barcodeService;
-
-  HeapHashSet<Member<ScriptPromiseResolver>> m_faceServiceRequests;
-  HeapHashSet<Member<ScriptPromiseResolver>> m_barcodeServiceRequests;
-
- protected:
-  mojom::blink::FaceDetectorOptionsPtr m_faceDetectorOptions;
+  virtual ScriptPromise doDetect(ScriptPromiseResolver*,
+                                 mojo::ScopedSharedBufferHandle,
+                                 int,
+                                 int) = 0;

[Reilly Grant (use Gerrit), 2016/12/06 20:40:13]

Same comment.

[xianglu, 2016/12/06 22:31:56]

Done.

 };
 
 }  // namespace blink