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

third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.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/BarcodeDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/geometry/DOMRect.h"
 #include "core/html/canvas/CanvasImageSource.h"
 #include "modules/imagecapture/Point2D.h"
 #include "modules/shapedetection/DetectedBarcode.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 BarcodeDetector* BarcodeDetector::Create() {
   return new BarcodeDetector();
 }
 
 BarcodeDetector::BarcodeDetector() : ShapeDetector() {
   Platform::Current()->GetInterfaceProvider()->GetInterface(
       mojo::MakeRequest(&barcode_service_));
   barcode_service_.set_connection_error_handler(ConvertToBaseCallback(
       WTF::Bind(&BarcodeDetector::OnBarcodeServiceConnectionError,
                 WrapWeakPersistent(this))));
 }
 
-ScriptPromise BarcodeDetector::DoDetect(
-    ScriptPromiseResolver* resolver,
-    mojo::ScopedSharedBufferHandle shared_buffer_handle,
-    int image_width,
-    int image_height) {
+ScriptPromise BarcodeDetector::DoDetect(ScriptPromiseResolver* resolver,
+                                        skia::mojom::blink::BitmapPtr bitmap) {
   ScriptPromise promise = resolver->Promise();
   if (!barcode_service_) {
     resolver->Reject(DOMException::Create(
         kNotSupportedError, "Barcode detection service unavailable."));
     return promise;
   }
   barcode_service_requests_.insert(resolver);
   barcode_service_->Detect(
-      std::move(shared_buffer_handle), image_width, image_height,
-      ConvertToBaseCallback(WTF::Bind(&BarcodeDetector::OnDetectBarcodes,
-                                      WrapPersistent(this),
-                                      WrapPersistent(resolver))));
+      std::move(bitmap), ConvertToBaseCallback(WTF::Bind(
+                             &BarcodeDetector::OnDetectBarcodes,
+                             WrapPersistent(this), WrapPersistent(resolver))));
   return promise;
 }
 
 void BarcodeDetector::OnDetectBarcodes(
     ScriptPromiseResolver* resolver,
     Vector<shape_detection::mojom::blink::BarcodeDetectionResultPtr>
         barcode_detection_results) {
   DCHECK(barcode_service_requests_.Contains(resolver));
   barcode_service_requests_.erase(resolver);
 
@@ skipping 25 matching lines @@
   barcode_service_requests_.clear();
   barcode_service_.reset();
 }
 
 DEFINE_TRACE(BarcodeDetector) {
   ShapeDetector::Trace(visitor);
   visitor->Trace(barcode_service_requests_);
 }
 
 }  // namespace blink