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

services/shape_detection/face_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/face_detection_impl_mac.h"
 
 #include "base/mac/scoped_cftyperef.h"
 #include "media/capture/video/scoped_result_callback.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shape_detection/detection_utils_mac.h"
@@ skipping 29 matching lines @@
   NSString* const accuracy =
       options->fast_mode ? CIDetectorAccuracyHigh : CIDetectorAccuracyLow;
   NSDictionary* const detector_options = @{CIDetectorAccuracy : accuracy};
   detector_.reset([[CIDetector detectorOfType:CIDetectorTypeFace
                                       context:nil
                                       options:detector_options] retain]);
 }
 
 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) {
     // 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);
 
@@ skipping 21 matching lines @@
           gfx::PointF(f.mouthPosition.x, height - f.mouthPosition.y);
       face->landmarks.push_back(std::move(landmark));
     }
 
     results.push_back(std::move(face));
   }
   scoped_callback.Run(std::move(results));
 }
 
 }  // namespace shape_detection