Shape Detection: Implement FaceDetection on Mac as out-of-process service

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"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/canvas/CanvasImageSource.h"
 #include "modules/shapedetection/DetectedBarcode.h"
+#include "platform/ServiceConnector.h"
 #include "platform/graphics/Image.h"
 #include "public/platform/InterfaceProvider.h"
+#include "services/shape_detection/public/interfaces/constants.mojom-blink.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "wtf/CheckedNumeric.h"
 
 namespace blink {
 
 namespace {
 
 static CanvasImageSource* toImageSourceInternal(
     const CanvasImageSourceUnion& value) {
   if (value.isHTMLImageElement())
     return value.getAsHTMLImageElement();
 
   if (value.isImageBitmap() &&
       !static_cast<ImageBitmap*>(value.getAsImageBitmap())->isNeutered()) {
     return value.getAsImageBitmap();
   }
 
   if (value.isHTMLVideoElement())
     return value.getAsHTMLVideoElement();
 
   return nullptr;
 }
 
 }  // anonymous namespace
 
+// TODO(xianglu): We don't need a service per frame. Remove this argument.
 ShapeDetector::ShapeDetector(LocalFrame& frame) {
   DCHECK(!m_faceService.is_bound());
   DCHECK(!m_barcodeService.is_bound());
+#if OS(MACOSX)
+  ServiceConnector::instance().ConnectToInterface(

[yzshen1, 2016/12/01 21:28:26]

Do we always need both m_faceService and m_barcodeService? could they be
initilalized when needed?

[xianglu, 2016/12/02 18:11:24]

That's a good point. I separated them to two constructors.

[yzshen1, 2016/12/05 17:41:19]

Depending on which constructor is called, this instance can only serve one type
of detection task (either barcode or face). In that case, it is redundant to
have |detectorType| parameter in the detectShapes() function signature. Right?

It seems to me you could either (1) eliminate |detectorType|, or (2) still use a
single constructor and lazily initialize |m_barcodeService| / |m_barcodeService|
when needed.

[xianglu, 2016/12/05 18:50:02]

Yes. ShapeDetector only serves one task, and users call either FaceDetector() or
BarcodeDetector(). Removing detectorType would be a good solution. However, it
might involve quite a bit of code refactoring. I think it's better to include
that in a separate CL.

+      shape_detection::mojom::blink::kServiceName,
+      mojo::GetProxy(&m_faceService));
+  ServiceConnector::instance().ConnectToInterface(
+      shape_detection::mojom::blink::kServiceName,
+      mojo::GetProxy(&m_barcodeService));
+#else
+  // TODO(xianglu): Move Android implementation to service/ as well.
   DCHECK(frame.interfaceProvider());
   frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_faceService));
   frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_barcodeService));
+#endif
   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) {
@@ skipping 334 matching lines @@
   m_barcodeServiceRequests.clear();
   m_barcodeService.reset();
 }
 
 DEFINE_TRACE(ShapeDetector) {
   visitor->trace(m_faceServiceRequests);
   visitor->trace(m_barcodeServiceRequests);
 }
 
 }  // namespace blink