ShapeDetection: Eliminate DetectorType enum in ShapeDetector.cpp

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

Index: third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.h
diff --git a/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.h b/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.h
index e8767457c207f7d15dcb49b4d5ad79c182a84bd5..2860fd736370280b5b8667b7f0ea9d9767e0340f 100644
--- a/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.h
+++ b/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.h
@@ -11,6 +11,7 @@
 #include "modules/ModulesExport.h"
 #include "modules/canvas2d/CanvasRenderingContext2D.h"
 #include "modules/shapedetection/ShapeDetector.h"
+#include "public/platform/modules/shapedetection/barcodedetection.mojom-blink.h"
 
 namespace blink {
 
@@ -23,12 +24,23 @@ class MODULES_EXPORT BarcodeDetector final : public ShapeDetector,
  public:
   static BarcodeDetector* create(Document&);
 
-  ScriptPromise detect(ScriptState*, const CanvasImageSourceUnion&);
   DECLARE_VIRTUAL_TRACE();
 
  private:
   explicit BarcodeDetector(LocalFrame&);
   ~BarcodeDetector() override = default;
+
+  ScriptPromise doDetect(ScriptPromiseResolver*,
+                         mojo::ScopedSharedBufferHandle,
+                         int,
+                         int);

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

Blink style allows unnamed parameters when the type name makes the variable name
redundant. Here it is unclear so please name your parameters.

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

Done.

+  void onDetectBarcodes(ScriptPromiseResolver*,
+                        Vector<mojom::blink::BarcodeDetectionResultPtr>);
+  void onBarcodeServiceConnectionError();
+
+  mojom::blink::BarcodeDetectionPtr m_barcodeService;
+
+  HeapHashSet<Member<ScriptPromiseResolver>> m_barcodeServiceRequests;
 };
 
 }  // namespace blink