REVERT: ShapeDetection: use mojom::Bitmap for mojo interface.

third_party/WebKit/Source/modules/shapedetection/FaceDetector.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/FaceDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/geometry/DOMRect.h"
 #include "core/html/canvas/CanvasImageSource.h"
 #include "modules/shapedetection/DetectedFace.h"
@@ skipping 17 matching lines @@
   shape_detection::mojom::blink::FaceDetectionProviderPtr provider;
   Platform::current()->interfaceProvider()->getInterface(
       mojo::MakeRequest(&provider));
   provider->CreateFaceDetection(mojo::MakeRequest(&m_faceService),
                                 std::move(faceDetectorOptions));
 
   m_faceService.set_connection_error_handler(convertToBaseCallback(WTF::bind(
       &FaceDetector::onFaceServiceConnectionError, wrapWeakPersistent(this))));
 }
 
-ScriptPromise FaceDetector::doDetect(ScriptPromiseResolver* resolver,
-                                     skia::mojom::blink::BitmapPtr bitmap) {
+ScriptPromise FaceDetector::doDetect(
+    ScriptPromiseResolver* resolver,
+    mojo::ScopedSharedBufferHandle sharedBufferHandle,
+    int imageWidth,
+    int imageHeight) {
   ScriptPromise promise = resolver->promise();
   if (!m_faceService) {
     resolver->reject(DOMException::create(
         NotSupportedError, "Face detection service unavailable."));
     return promise;
   }
   m_faceServiceRequests.insert(resolver);
-  m_faceService->Detect(std::move(bitmap),
+  m_faceService->Detect(std::move(sharedBufferHandle), imageWidth, imageHeight,
                         convertToBaseCallback(WTF::bind(
                             &FaceDetector::onDetectFaces, wrapPersistent(this),
                             wrapPersistent(resolver))));
   return promise;
 }
 
 void FaceDetector::onDetectFaces(
     ScriptPromiseResolver* resolver,
     shape_detection::mojom::blink::FaceDetectionResultPtr faceDetectionResult) {
   DCHECK(m_faceServiceRequests.contains(resolver));
@@ skipping 17 matching lines @@
   m_faceServiceRequests.clear();
   m_faceService.reset();
 }
 
 DEFINE_TRACE(FaceDetector) {
   ShapeDetector::trace(visitor);
   visitor->trace(m_faceServiceRequests);
 }
 
 }  // namespace blink