| Index: services/shape_detection/text_detection_impl_mac.mm
|
| diff --git a/services/shape_detection/text_detection_impl_mac.mm b/services/shape_detection/text_detection_impl_mac.mm
|
| index 3894770ada51c1c4a0e20e75e3a7341d5c1197cc..45d8d4639523410d3d92f0298eadce0a6fb88d4e 100644
|
| --- a/services/shape_detection/text_detection_impl_mac.mm
|
| +++ b/services/shape_detection/text_detection_impl_mac.mm
|
| @@ -48,22 +48,20 @@ TextDetectionImplMac::TextDetectionImplMac() {
|
|
|
| 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.
|
|
|