Index: services/shape_detection/face_detection_impl_mac.mm |
diff --git a/services/shape_detection/face_detection_impl_mac.mm b/services/shape_detection/face_detection_impl_mac.mm |
index 151e0a7ce8666a6d51627393af66d0329c01b90b..8bece619b5ebc998bbe350764c1fb1b609452787 100644 |
--- a/services/shape_detection/face_detection_impl_mac.mm |
+++ b/services/shape_detection/face_detection_impl_mac.mm |
@@ -47,21 +47,19 @@ FaceDetectionImplMac::FaceDetectionImplMac( |
FaceDetectionImplMac::~FaceDetectionImplMac() {} |
-void FaceDetectionImplMac::Detect(mojo::ScopedSharedBufferHandle frame_data, |
- uint32_t width, |
- uint32_t height, |
+void FaceDetectionImplMac::Detect(const SkBitmap& bitmap, |
const DetectCallback& callback) { |
media::ScopedResultCallback<DetectCallback> scoped_callback( |
base::Bind(&RunCallbackWithFaces, callback), |
base::Bind(&RunCallbackWithNoFaces)); |
- 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(); |
shape_detection::mojom::FaceDetectionResultPtr faces = |
shape_detection::mojom::FaceDetectionResult::New(); |
for (CIFaceFeature* const f in features) { |