Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java

Issue 2945903002: Rendering the image in the sandbox for security (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0a202f066e61f590759760f9b8ba34d4bba4c50a..ab4424256b77cc7a5453505fea3828d3a7bf8f09 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;
@@ -198,7 +197,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);
}
/**
@@ -209,15 +208,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> rawDataCallback = new Callback<Bitmap>() {
Ted C 2017/06/21 00:18:02 let's rename rawData to bitmapCallback
Daniel Park 2017/06/22 00:54:09 Done.
@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, rawDataCallback, maxSizePx);
}
@Override
@@ -245,7 +242,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);
}

Powered by Google App Engine
This is Rietveld 408576698