ShapeDetection: Add FaceDetectorOptions for fastMode and maxDetectedFaces

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/shapedetection/ShapeDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/DOMRect.h"
 #include "core/dom/Document.h"
 #include "core/fetch/ImageResource.h"
@@ skipping 148 matching lines @@
     resolver->reject(DOMException::create(
         NotSupportedError, "Shape detection service unavailable."));
     return promise;
   }
 
   m_serviceRequests.add(resolver);
   DCHECK(m_service.is_bound());
   if (detectorType == DetectorType::Face) {
     m_service->DetectFaces(
         std::move(sharedBufferHandle), img->naturalWidth(),
-        img->naturalHeight(),
+        img->naturalHeight(), m_options.Clone(),
         convertToBaseCallback(WTF::bind(&ShapeDetector::onDetectFaces,
                                         wrapPersistent(this),
                                         wrapPersistent(resolver))));
   } else if (detectorType == DetectorType::Barcode) {
     m_service->DetectBarcodes(
         std::move(sharedBufferHandle), img->naturalWidth(),
         img->naturalHeight(),
         convertToBaseCallback(WTF::bind(&ShapeDetector::onDetectBarcodes,
                                         wrapPersistent(this),
                                         wrapPersistent(resolver))));
@@ skipping 119 matching lines @@
   const mojo::ScopedSharedBufferMapping mappedBuffer =
       sharedBufferHandle->Map(size);
   DCHECK(mappedBuffer.get());
 
   memcpy(mappedBuffer.get(), data, size);
 
   m_serviceRequests.add(resolver);
   DCHECK(m_service.is_bound());
   if (detectorType == DetectorType::Face) {
     m_service->DetectFaces(
-        std::move(sharedBufferHandle), width, height,
+        std::move(sharedBufferHandle), width, height, m_options.Clone(),
         convertToBaseCallback(WTF::bind(&ShapeDetector::onDetectFaces,
                                         wrapPersistent(this),
                                         wrapPersistent(resolver))));
   } else if (detectorType == DetectorType::Barcode) {
     m_service->DetectBarcodes(
         std::move(sharedBufferHandle), width, height,
         convertToBaseCallback(WTF::bind(&ShapeDetector::onDetectBarcodes,
                                         wrapPersistent(this),
                                         wrapPersistent(resolver))));
   } else {
     NOTREACHED() << "Unsupported detector type";
   }
   sharedBufferHandle.reset();
   return promise;
 }
 
 void ShapeDetector::onDetectFaces(
     ScriptPromiseResolver* resolver,
     mojom::blink::FaceDetectionResultPtr faceDetectionResult) {
   if (!m_serviceRequests.contains(resolver))
     return;
 
   HeapVector<Member<DOMRect>> detectedFaces;
-  for (const auto& boundingBox : faceDetectionResult->boundingBoxes) {
+  for (const auto& boundingBox : faceDetectionResult->bounding_boxes) {
     detectedFaces.append(DOMRect::create(boundingBox->x, boundingBox->y,
                                          boundingBox->width,
                                          boundingBox->height));
   }
 
   resolver->resolve(detectedFaces);
   m_serviceRequests.remove(resolver);
 }
 
 void ShapeDetector::onDetectBarcodes(
@@ skipping 13 matching lines @@
   }
 
   resolver->resolve(detectedBarcodes);
 }
 
 DEFINE_TRACE(ShapeDetector) {
   visitor->trace(m_serviceRequests);
 }
 
 }  // namespace blink