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

services/shape_detection/text_detection_impl_mac.mm

 // 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 "services/shape_detection/text_detection_impl_mac.h"
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 32 matching lines @@
 
 TextDetectionImplMac::TextDetectionImplMac() {
   NSDictionary* const opts = @{CIDetectorAccuracy : CIDetectorAccuracyHigh};
   detector_.reset([[CIDetector detectorOfType:CIDetectorTypeText
                                       context:nil
                                       options:opts] retain]);
 }
 
 TextDetectionImplMac::~TextDetectionImplMac() {}
 
-void TextDetectionImplMac::Detect(mojo::ScopedSharedBufferHandle frame_data,
-                                  uint32_t width,
-                                  uint32_t height,
+void TextDetectionImplMac::Detect(const SkBitmap& bitmap,
                                   const DetectCallback& callback) {
   DCHECK(base::mac::IsAtLeastOS10_11());
   media::ScopedResultCallback<DetectCallback> scoped_callback(
       base::Bind(&RunCallbackWithResults, callback),
       base::Bind(&RunCallbackWithNoResults));
 
-  base::scoped_nsobject<CIImage> ci_image =
-      CreateCIImageFromSharedMemory(std::move(frame_data), width, height);
+  base::scoped_nsobject<CIImage> ci_image = CreateCIImageFromSkBitmap(bitmap);
   if (!ci_image)
     return;
 
   NSArray* const features = [detector_ featuresInImage:ci_image];
 
+  const int height = bitmap.height();
   std::vector<mojom::TextDetectionResultPtr> results;
   for (CIRectangleFeature* const f in features) {
     // CIRectangleFeature only has bounding box information.
     auto result = mojom::TextDetectionResult::New();
     // In the default Core Graphics coordinate space, the origin is located
     // in the lower-left corner, and thus |ci_image| is flipped vertically.
     // We need to adjust |y| coordinate of bounding box before sending it.
     gfx::RectF boundingbox(f.bounds.origin.x,
                            height - f.bounds.origin.y - f.bounds.size.height,
                            f.bounds.size.width, f.bounds.size.height);
     result->bounding_box = std::move(boundingbox);
     results.push_back(std::move(result));
   }
   scoped_callback.Run(std::move(results));
 }
 
 }  // namespace shape_detection