Face Detection: Use DetectedFace in FaceDetector.cpp iso DOMRect

FaceDetector.detect() in ToT returns a sequence<DetectedObject>,
but DetectedObject doesn't exist, and it should return DetectedFace
instead according to the Spec. Also, DetectedFace is not used at the
moment (FaceDetector  goes around this issue by returning DOMRects
directly).

This CL sorts that out by returning DetectedFaces directly.

BUG=673075

Review-Url: https://codereview.chromium.org/2564123003
Cr-Commit-Position: refs/heads/master@{#437794}

content/test/data/media/face_detection_test.html

@@ -16,9 +16,9 @@
       var detector = new FaceDetector();
       var results = "";
       detector.detect(img)
-        .then(boundingBoxes => {
-          for (var i=0; i<boundingBoxes.length; i++) {
-            var boundingBox = boundingBoxes[i];
+        .then(detectedFaces => {
+          for (var i = 0; i < detectedFaces.length; i++) {
+            var boundingBox = detectedFaces[i].boundingBox;
             var result = boundingBox.x + "," + boundingBox.y + "," +
                          boundingBox.width + "," + boundingBox.height;
             results += result + "#";

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

@@ -27,7 +27,7 @@ class MODULES_EXPORT DetectedBarcode final
   DECLARE_TRACE();
 
  private:
-  DetectedBarcode(String rawValue, DOMRect* boundingBox);
+  DetectedBarcode(String, DOMRect*);
 
   const String m_rawValue;
   const Member<DOMRect> m_boundingBox;

third_party/WebKit/Source/modules/shapedetection/DetectedFace.cpp

@@ -9,13 +9,19 @@
 namespace blink {
 
 DetectedFace* DetectedFace::create() {
-  return new DetectedFace();
+  return new DetectedFace(DOMRect::create());
+}
+
+DetectedFace* DetectedFace::create(DOMRect* boundingBox) {
+  return new DetectedFace(boundingBox);
 }
 
 DOMRect* DetectedFace::boundingBox() const {
   return m_boundingBox.get();
 }
 
+DetectedFace::DetectedFace(DOMRect* boundingBox) : m_boundingBox(boundingBox) {}
+
 DEFINE_TRACE(DetectedFace) {
   visitor->trace(m_boundingBox);
 }

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

@@ -18,10 +18,14 @@ class MODULES_EXPORT DetectedFace final : public GarbageCollected<DetectedFace>,
 
  public:
   static DetectedFace* create();
+  static DetectedFace* create(DOMRect*);
+
   DOMRect* boundingBox() const;
   DECLARE_TRACE();
 
  private:
+  explicit DetectedFace(DOMRect*);
+
   Member<DOMRect> m_boundingBox;
 };
 

third_party/WebKit/Source/modules/shapedetection/DetectedFace.idl

@@ -8,6 +8,6 @@
     Constructor,
     RuntimeEnabled=ShapeDetection,
 ] interface DetectedFace {
-    // TODO(xianglu): Implement missing fields. https://crbug.com/646083
+    // TODO(xianglu): Implement any other fields. https://crbug.com/646083
     readonly attribute DOMRect boundingBox;
 };

third_party/WebKit/Source/modules/shapedetection/FaceDetector.cpp

@@ -9,6 +9,7 @@
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/canvas/CanvasImageSource.h"
+#include "modules/shapedetection/DetectedFace.h"
 #include "public/platform/InterfaceProvider.h"
 
 namespace blink {
@@ -55,11 +56,11 @@ void FaceDetector::onDetectFaces(
   DCHECK(m_faceServiceRequests.contains(resolver));
   m_faceServiceRequests.remove(resolver);
 
-  HeapVector<Member<DOMRect>> detectedFaces;
+  HeapVector<Member<DetectedFace>> detectedFaces;
   for (const auto& boundingBox : faceDetectionResult->bounding_boxes) {
-    detectedFaces.append(DOMRect::create(boundingBox->x, boundingBox->y,
-                                         boundingBox->width,
-                                         boundingBox->height));
+    detectedFaces.append(DetectedFace::create(
+        DOMRect::create(boundingBox->x, boundingBox->y, boundingBox->width,
+                        boundingBox->height)));
   }
 
   resolver->resolve(detectedFaces);

third_party/WebKit/Source/modules/shapedetection/FaceDetector.idl

@@ -10,5 +10,5 @@
     Exposed=(Window,Worker),
     RuntimeEnabled=ShapeDetection,
 ] interface FaceDetector {
-    [CallWith=ScriptState, Measure] Promise<sequence<DetectedObject>> detect(CanvasImageSource image);
+    [CallWith=ScriptState, Measure] Promise<sequence<DetectedFace>> detect(CanvasImageSource image);
 };