Rendering the image in the sandbox for security

chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
index 1af8b573de88fe96edeb43e6beb6cf040f7c7f62..0c1dd7538dcfeb5cd53ee6c58539ba54bf3ed5a6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.contextmenu;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.util.Pair;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -205,7 +204,7 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
                 ShareHelper.shareImage(activity, result, name);
             }
         };
-        nativeRetrieveImage(mNativeContextMenuHelper, callback, MAX_SHARE_DIMEN_PX);
+        nativeRetrieveImageForShare(mNativeContextMenuHelper, callback, MAX_SHARE_DIMEN_PX);
     }
 
     /**
@@ -216,15 +215,13 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
         if (mNativeContextMenuHelper == 0) return;
         int maxSizePx = mActivity.getResources().getDimensionPixelSize(
                 R.dimen.context_menu_header_image_max_size);
-        Callback<byte[]> rawDataCallback = new Callback<byte[]>() {
+        Callback<Bitmap> bitmapCallback = new Callback<Bitmap>() {
             @Override
-            public void onResult(byte[] result) {
-                // TODO(tedchoc): Decode in separate process before launch.
-                Bitmap bitmap = BitmapFactory.decodeByteArray(result, 0, result.length);
-                callback.onResult(bitmap);
+            public void onResult(Bitmap result) {
+                callback.onResult(result);
             }
         };
-        nativeRetrieveImage(mNativeContextMenuHelper, rawDataCallback, maxSizePx);
+        nativeRetrieveImageForContextMenu(mNativeContextMenuHelper, bitmapCallback, maxSizePx);
     }
 
     @Override
@@ -253,7 +250,9 @@ public class ContextMenuHelper implements OnCreateContextMenuListener {
     private native void nativeOnStartDownload(
             long nativeContextMenuHelper, boolean isLink, boolean isDataReductionProxyEnabled);
     private native void nativeSearchForImage(long nativeContextMenuHelper);
-    private native void nativeRetrieveImage(
+    private native void nativeRetrieveImageForShare(
             long nativeContextMenuHelper, Callback<byte[]> callback, int maxSizePx);
+    private native void nativeRetrieveImageForContextMenu(
+            long nativeContextMenuHelper, Callback<Bitmap> callback, int maxSizePx);
     private native void nativeOnContextMenuClosed(long nativeContextMenuHelper);
 }