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

services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java

 // 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.
 
 package org.chromium.shape_detection;
 
 import android.content.Context;
 import android.graphics.PointF;
 import android.util.SparseArray;
 
 import com.google.android.gms.vision.Frame;
 import com.google.android.gms.vision.face.Face;
 import com.google.android.gms.vision.face.FaceDetector;
 import com.google.android.gms.vision.face.Landmark;
 
 import org.chromium.base.Log;
 import org.chromium.gfx.mojom.RectF;
 import org.chromium.mojo.system.MojoException;
-import org.chromium.mojo.system.SharedBufferHandle;
 import org.chromium.shape_detection.mojom.FaceDetection;
 import org.chromium.shape_detection.mojom.FaceDetectionResult;
 import org.chromium.shape_detection.mojom.FaceDetectorOptions;
 import org.chromium.shape_detection.mojom.LandmarkType;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Google Play services implementation of the FaceDetection service defined in
@@ skipping 19 matching lines @@
             }
         } catch (IllegalArgumentException e) {
             Log.e(TAG, "Unexpected exception " + e);
             assert false;
         }
 
         mFaceDetector = builder.build();
     }
 
     @Override
-    public void detect(
-            SharedBufferHandle frameData, int width, int height, DetectResponse callback) {
+    public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
         // The vision library will be downloaded the first time the API is used
         // on the device; this happens "fast", but it might have not completed,
         // bail in this case.
         if (!mFaceDetector.isOperational()) {
             Log.e(TAG, "FaceDetector is not operational");
 
             // Fallback to Android's FaceDetectionImpl.
             FaceDetectorOptions options = new FaceDetectorOptions();
             options.fastMode = mFastMode;
             options.maxDetectedFaces = mMaxFaces;
             FaceDetectionImpl detector = new FaceDetectionImpl(options);
-            detector.detect(frameData, width, height, callback);
+            detector.detect(bitmapData, callback);
             return;
         }
 
-        Frame frame = SharedBufferUtils.convertToFrame(frameData, width, height);
+        Frame frame = SharedBufferUtils.convertToFrame(bitmapData);
         if (frame == null) {
             Log.e(TAG, "Error converting SharedMemory to Frame");
             callback.call(new FaceDetectionResult[0]);
             return;
         }
 
         final SparseArray<Face> faces = mFaceDetector.detect(frame);
 
         FaceDetectionResult[] faceArray = new FaceDetectionResult[faces.size()];
         for (int i = 0; i < faces.size(); i++) {
@@ skipping 35 matching lines @@
     @Override
     public void close() {
         mFaceDetector.release();
     }
 
     @Override
     public void onConnectionError(MojoException e) {
         close();
     }
 }