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 4057a7420866e018d761e5790db7038a73dfc5c3..7ff5856a1ad434e0bdd3fa6d5279a3b5c859b6a7 100644 |
--- a/services/shape_detection/face_detection_impl_mac.mm |
+++ b/services/shape_detection/face_detection_impl_mac.mm |
@@ -47,20 +47,18 @@ 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(); |
std::vector<mojom::FaceDetectionResultPtr> results; |
for (CIFaceFeature* const f in features) { |