Barcode/Face detection: reject requests in platforms where not implemented

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 31 matching lines @@
 }
 
 }  // anonymous namespace
 
 ShapeDetector::ShapeDetector(LocalFrame& frame) {
   DCHECK(!m_faceService.is_bound());
   DCHECK(!m_barcodeService.is_bound());
   DCHECK(frame.interfaceProvider());
   frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_faceService));
   frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_barcodeService));
+  m_faceService.set_connection_error_handler(convertToBaseCallback(WTF::bind(
+      &ShapeDetector::onFaceServiceConnectionError, wrapWeakPersistent(this))));
+  m_barcodeService.set_connection_error_handler(convertToBaseCallback(
+      WTF::bind(&ShapeDetector::onBarcodeServiceConnectionError,
+                wrapWeakPersistent(this))));
 }
 
 ShapeDetector::ShapeDetector(LocalFrame& frame,
                              const FaceDetectorOptions& options)
     : ShapeDetector(frame) {
   m_faceDetectorOptions = mojom::blink::FaceDetectorOptions::New();
   m_faceDetectorOptions->max_detected_faces = options.maxDetectedFaces();
   m_faceDetectorOptions->fast_mode = options.fastMode();
 }
 
@@ skipping 96 matching lines @@
       sharedBufferHandle->Map(allocationSize);
 
   const SkPixmap pixmap(skiaInfo, mappedBuffer.get(), skiaInfo.minRowBytes());
   if (!image->readPixels(pixmap, 0, 0)) {
     resolver->reject(DOMException::create(
         InvalidStateError,
         "Failed to read pixels: Unable to decompress or unsupported format."));
     return promise;
   }
 
-  m_serviceRequests.add(resolver);
   if (detectorType == DetectorType::Face) {
-    if (!m_faceService) {
-      resolver->reject(DOMException::create(
-          NotSupportedError, "Face detection service unavailable."));
-      return promise;
-    }
+    DCHECK(m_faceService);

[Reilly Grant (use Gerrit), 2016/11/30 21:43:28]

We should still have the code to reject the promise here.

[mcasas, 2016/11/30 21:49:51]

Done.

+    m_faceServiceRequests.add(resolver);
     m_faceService->Detect(std::move(sharedBufferHandle), img->naturalWidth(),
                           img->naturalHeight(), m_faceDetectorOptions.Clone(),
                           convertToBaseCallback(WTF::bind(
                               &ShapeDetector::onDetectFaces,
                               wrapPersistent(this), wrapPersistent(resolver))));
   } else if (detectorType == DetectorType::Barcode) {
-    if (!m_barcodeService) {
-      resolver->reject(DOMException::create(
-          NotSupportedError, "Barcode detection service unavailable."));
-      return promise;
-    }
+    DCHECK(m_barcodeService);
+    m_barcodeServiceRequests.add(resolver);
     m_barcodeService->Detect(
         std::move(sharedBufferHandle), img->naturalWidth(),
         img->naturalHeight(),
         convertToBaseCallback(WTF::bind(&ShapeDetector::onDetectBarcodes,
                                         wrapPersistent(this),
                                         wrapPersistent(resolver))));
   } else {
     NOTREACHED() << "Unsupported detector type";
   }
 
@@ skipping 105 matching lines @@
         DOMException::create(InvalidStateError, "Internal allocation error"));
     return promise;
   }
 
   const mojo::ScopedSharedBufferMapping mappedBuffer =
       sharedBufferHandle->Map(size);
   DCHECK(mappedBuffer.get());
 
   memcpy(mappedBuffer.get(), data, size);
 
-  m_serviceRequests.add(resolver);
   if (detectorType == DetectorType::Face) {
-    if (!m_faceService) {
-      resolver->reject(DOMException::create(
-          NotSupportedError, "Face detection service unavailable."));
-      return promise;
-    }
+    DCHECK(m_faceService);
+    m_faceServiceRequests.add(resolver);
     m_faceService->Detect(std::move(sharedBufferHandle), width, height,
                           m_faceDetectorOptions.Clone(),
                           convertToBaseCallback(WTF::bind(
                               &ShapeDetector::onDetectFaces,
                               wrapPersistent(this), wrapPersistent(resolver))));
   } else if (detectorType == DetectorType::Barcode) {
-    if (!m_barcodeService) {
-      resolver->reject(DOMException::create(
-          NotSupportedError, "Barcode detection service unavailable."));
-      return promise;
-    }
+    DCHECK(m_barcodeService);
+    m_barcodeServiceRequests.add(resolver);
     m_barcodeService->Detect(
         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))
+  if (!m_faceServiceRequests.contains(resolver))
     return;
+  m_faceServiceRequests.remove(resolver);
 
   HeapVector<Member<DOMRect>> detectedFaces;
   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(
     ScriptPromiseResolver* resolver,
     Vector<mojom::blink::BarcodeDetectionResultPtr> barcodeDetectionResults) {
-  if (!m_serviceRequests.contains(resolver))
+  if (!m_barcodeServiceRequests.contains(resolver))
     return;
-  m_serviceRequests.remove(resolver);
+  m_barcodeServiceRequests.remove(resolver);
 
   HeapVector<Member<DetectedBarcode>> detectedBarcodes;
   for (const auto& barcode : barcodeDetectionResults) {
     detectedBarcodes.append(DetectedBarcode::create(
         barcode->raw_value,
         DOMRect::create(barcode->bounding_box->x, barcode->bounding_box->y,
                         barcode->bounding_box->width,
                         barcode->bounding_box->height)));
   }
 
   resolver->resolve(detectedBarcodes);
 }
 
+void ShapeDetector::onFaceServiceConnectionError() {
+  for (const auto& request : m_faceServiceRequests) {
+    request->reject(DOMException::create(NotSupportedError,
+                                         "Face Detection not implemented."));
+  }
+  m_faceServiceRequests.clear();

[Reilly Grant (use Gerrit), 2016/11/30 21:43:28]

Reset m_faceService so that code above knows the connection has be closed. You
only get one connection error.

[mcasas, 2016/11/30 21:49:51]

Done.

+}
+
+void ShapeDetector::onBarcodeServiceConnectionError() {
+  for (const auto& request : m_barcodeServiceRequests) {
+    request->reject(DOMException::create(NotSupportedError,
+                                         "Barcode Detection not implemented."));
+  }
+  m_barcodeServiceRequests.clear();
+}
+
 DEFINE_TRACE(ShapeDetector) {
-  visitor->trace(m_serviceRequests);
+  visitor->trace(m_faceServiceRequests);
+  visitor->trace(m_barcodeServiceRequests);
 }
 
 }  // namespace blink