ShapeDetection: use mojom::Bitmap for mojo interface.

chrome/android/java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java

 // Copyright 2016 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.chrome.browser.shapedetection;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.util.SparseArray;
 
 import com.google.android.gms.vision.Frame;
 import com.google.android.gms.vision.barcode.Barcode;
 import com.google.android.gms.vision.barcode.BarcodeDetector;
 
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
 import org.chromium.gfx.mojom.PointF;
 import org.chromium.gfx.mojom.RectF;
 import org.chromium.mojo.system.MojoException;
-import org.chromium.mojo.system.SharedBufferHandle;
-import org.chromium.mojo.system.SharedBufferHandle.MapFlags;
 import org.chromium.services.service_manager.InterfaceFactory;
 import org.chromium.shape_detection.mojom.BarcodeDetection;
 import org.chromium.shape_detection.mojom.BarcodeDetectionResult;
+import org.chromium.skia.mojom.ColorType;
 
 import java.nio.ByteBuffer;
 
 /**
  * Implementation of mojo BarcodeDetection, using Google Play Services vision package.
  */
 public class BarcodeDetectionImpl implements BarcodeDetection {
     private static final String TAG = "BarcodeDetectionImpl";
 
     private final Context mContext;
     private BarcodeDetector mBarcodeDetector;
 
     public BarcodeDetectionImpl(Context context) {
         mContext = context;
         mBarcodeDetector = new BarcodeDetector.Builder(mContext).build();
     }
 
+    private Config validConfig(int colorType) {
+        switch (colorType) {
+            case ColorType.ALPHA_8:
+                return Config.ALPHA_8;
+            case ColorType.RGB_565:
+                return Config.RGB_565;
+            case ColorType.ARGB_4444:
+                return Config.ARGB_4444;
+            case ColorType.RGBA_8888:
+            case ColorType.BGRA_8888:
+                return Config.ARGB_8888;
+        }
+        return null;
+    }
+
     @Override
-    public void detect(
-            SharedBufferHandle frameData, int width, int height, DetectResponse callback) {
+    public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
         if (!ExternalAuthUtils.getInstance().canUseGooglePlayServices(
                     mContext, new UserRecoverableErrorHandler.Silent())) {
             Log.e(TAG, "Google Play Services not available");
             callback.call(new BarcodeDetectionResult[0]);
             return;
         }
         // 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. Also, the API was disabled between and v.9.0 and
         // v.9.2, see https://developers.google.com/android/guides/releases.
         if (!mBarcodeDetector.isOperational()) {
             Log.e(TAG, "BarcodeDetector is not operational");
             callback.call(new BarcodeDetectionResult[0]);
             return;
         }
 
+        int width = bitmapData.width;
+        int height = bitmapData.height;
+        Config bitmapConfig = validConfig(bitmapData.colorType);

[mcasas, 2017/01/24 20:48:31]

The problem is that, even though the code reads as 
if a variety of bitmapData.colorType are supported,
I believe only ARGB/BGRA_8888 would work, and anyway
I can't imagine how to test this code, so what I would
recommend is to limit the inputs to what we know works
and can be tested today, i.e. remove validConfig()
and instead of this line just do

        if (bitmapData.colorType != ColorType.RGBA_8888
                && bitmapData.colorType != ColorType.BGRA_8888) {
            Log.e(TAG, "Unsupported bitmap pixel format");
            callback.call(new BarcodeDetectionResult[0]);
            return;
        }

remove the added check in l.84 and 
s/bitmapConfig/bitmapData.colorType/ in l.98.

For bonus points, I'd make a new crbug.com in the lines
of "add support for other bitmap pixel formats" and
add a 
// TODO(junwei.fu): Consider supporting ... https://crbug.com/xyzxyz

before the proposed if(bitmapData.colorType...) clause.

All this also applies to the other DetectionImpl.java.

         final long numPixels = (long) width * height;
         // TODO(mcasas): https://crbug.com/670028 homogeneize overflow checking.
-        if (!frameData.isValid() || width <= 0 || height <= 0 || numPixels > (Long.MAX_VALUE / 4)) {
+        if (bitmapData.pixelData == null || width <= 0 || height <= 0
+                || numPixels > (Long.MAX_VALUE / 4) || bitmapConfig == null) {
             callback.call(new BarcodeDetectionResult[0]);
             return;
         }
 
         // Mapping |frameData| will fail if the intended mapped size is larger
         // than its actual capacity, which is limited by the appropriate
         // mojo::edk::Configuration entry.
-        ByteBuffer imageBuffer = frameData.map(0, numPixels * 4, MapFlags.none());
+        ByteBuffer imageBuffer = ByteBuffer.wrap(bitmapData.pixelData);
         if (imageBuffer.capacity() <= 0) {
             callback.call(new BarcodeDetectionResult[0]);
             return;
         }
 
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Bitmap bitmap = Bitmap.createBitmap(width, height, bitmapConfig);
         bitmap.copyPixelsFromBuffer(imageBuffer);
 
         Frame frame = null;
         try {
             // This constructor implies a pixel format conversion to YUV.
             frame = new Frame.Builder().setBitmap(bitmap).build();
         } catch (IllegalArgumentException | IllegalStateException ex) {
             Log.e(TAG, "Frame.Builder().setBitmap() or build(): " + ex);
             callback.call(new BarcodeDetectionResult[0]);
             return;
@@ skipping 42 matching lines @@
         public Factory(Context context) {
             mContext = context;
         }
 
         @Override
         public BarcodeDetection createImpl() {
             return new BarcodeDetectionImpl(mContext);
         }
     }
 }