ShapeDetection: use mojom::Bitmap for mojo interface.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/shapedetection/TextDetectionImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/TextDetectionImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/TextDetectionImpl.java
index 2f4fab05161550ec61a1e58f917225984669db9f..cdfc905ae03e55df4aacdd86ee95851cc348bb0f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/TextDetectionImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/shapedetection/TextDetectionImpl.java
@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.shapedetection;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Rect;
 import android.util.SparseArray;
 
@@ -18,11 +19,10 @@ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
 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.TextDetection;
 import org.chromium.shape_detection.mojom.TextDetectionResult;
+import org.chromium.skia.mojom.ColorType;
 
 import java.nio.ByteBuffer;
 
@@ -40,9 +40,23 @@ public class TextDetectionImpl implements TextDetection {
         mTextRecognizer = new TextRecognizer.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");
@@ -59,9 +73,13 @@ public class TextDetectionImpl implements TextDetection {
             return;
         }
 
+        int width = bitmapData.width;
+        int height = bitmapData.height;
+        Config bitmapConfig = validConfig(bitmapData.colorType);
         final long numPixels = (long) width * height;
         // TODO(xianglu): 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 TextDetectionResult[0]);
             return;
         }
@@ -69,13 +87,13 @@ public class TextDetectionImpl implements TextDetection {
         // 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 TextDetectionResult[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;