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

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

 // Copyright 2017 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/TextDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/geometry/DOMRect.h"
 #include "core/html/canvas/CanvasImageSource.h"
 #include "modules/shapedetection/DetectedText.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 TextDetector* TextDetector::Create() {
   return new TextDetector();
 }
 
 TextDetector::TextDetector() : ShapeDetector() {
   Platform::Current()->GetInterfaceProvider()->GetInterface(
       mojo::MakeRequest(&text_service_));
   text_service_.set_connection_error_handler(ConvertToBaseCallback(WTF::Bind(
       &TextDetector::OnTextServiceConnectionError, WrapWeakPersistent(this))));
 }
 
-ScriptPromise TextDetector::DoDetect(
-    ScriptPromiseResolver* resolver,
-    mojo::ScopedSharedBufferHandle shared_buffer_handle,
-    int image_width,
-    int image_height) {
+ScriptPromise TextDetector::DoDetect(ScriptPromiseResolver* resolver,
+                                     skia::mojom::blink::BitmapPtr bitmap) {
   ScriptPromise promise = resolver->Promise();
   if (!text_service_) {
     resolver->Reject(DOMException::Create(
         kNotSupportedError, "Text detection service unavailable."));
     return promise;
   }
   text_service_requests_.insert(resolver);
-  text_service_->Detect(std::move(shared_buffer_handle), image_width,
-                        image_height,
+  text_service_->Detect(std::move(bitmap),
                         ConvertToBaseCallback(WTF::Bind(
                             &TextDetector::OnDetectText, WrapPersistent(this),
                             WrapPersistent(resolver))));
   return promise;
 }
 
 void TextDetector::OnDetectText(
     ScriptPromiseResolver* resolver,
     Vector<shape_detection::mojom::blink::TextDetectionResultPtr>
         text_detection_results) {
@@ skipping 20 matching lines @@
   text_service_requests_.clear();
   text_service_.reset();
 }
 
 DEFINE_TRACE(TextDetector) {
   ShapeDetector::Trace(visitor);
   visitor->Trace(text_service_requests_);
 }
 
 }  // namespace blink