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

Unified Diff: content/browser/web_contents/web_contents_android.cc

Issue 2014553002: Implement WebContents.downloadImage() on Java side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Ted's comments Created 4 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
« no previous file with comments | « content/browser/web_contents/web_contents_android.h ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_android.cc
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
index 87c8b2d1cf169debb694c133e5096a5cfb5840ce..fb45acf0584dd520eb5d13d4be5e5f7d60f24428 100644
--- a/content/browser/web_contents/web_contents_android.cc
+++ b/content/browser/web_contents/web_contents_android.cc
@@ -673,6 +673,25 @@ void WebContentsAndroid::ReloadLoFiImages(JNIEnv* env,
static_cast<WebContentsImpl*>(web_contents_)->ReloadLoFiImages();
}
+int WebContentsAndroid::DownloadImage(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ const base::android::JavaParamRef<jstring>& jurl,
+ jboolean is_fav_icon,
+ jint max_bitmap_size,
+ jboolean bypass_cache,
+ const base::android::JavaParamRef<jobject>& jcallback) {
+ GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
+ return web_contents_->DownloadImage(
+ url, is_fav_icon, max_bitmap_size, bypass_cache,
+ base::Bind(&WebContentsAndroid::OnFinishDownloadImage,
+ weak_factory_.GetWeakPtr(),
+ base::Owned(new ScopedJavaGlobalRef<jobject>(
+ env, obj)),
+ base::Owned(new ScopedJavaGlobalRef<jobject>(
+ env, jcallback))));
+}
+
void WebContentsAndroid::OnFinishGetContentBitmap(
ScopedJavaGlobalRef<jobject>* obj,
ScopedJavaGlobalRef<jobject>* callback,
@@ -689,4 +708,35 @@ void WebContentsAndroid::OnFinishGetContentBitmap(
response);
}
+void WebContentsAndroid::OnFinishDownloadImage(
+ base::android::ScopedJavaGlobalRef<jobject>* obj,
+ base::android::ScopedJavaGlobalRef<jobject>* callback,
+ int id,
+ int http_status_code,
+ const GURL& url,
+ const std::vector<SkBitmap>& bitmaps,
+ const std::vector<gfx::Size>& sizes) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> jbitmaps =
+ Java_WebContentsImpl_createBitmapList(env);
+ ScopedJavaLocalRef<jobject> jsizes =
+ Java_WebContentsImpl_createSizeList(env);
+ ScopedJavaLocalRef<jstring> jurl =
+ base::android::ConvertUTF8ToJavaString(env, url.spec());
+
+ for (const SkBitmap& bitmap : bitmaps) {
+ // WARNING: convering to java bitmaps results in duplicate memory
+ // allocations, which increases the chance of OOMs if DownloadImage() is
+ // misused.
+ ScopedJavaLocalRef<jobject> jbitmap = gfx::ConvertToJavaBitmap(&bitmap);
+ Java_WebContentsImpl_addToBitmapList(env, jbitmaps.obj(), jbitmap.obj());
+ }
+ for (const gfx::Size& size : sizes) {
+ Java_WebContentsImpl_createSizeAndAddToList(
+ env, jsizes.obj(), size.width(), size.height());
+ }
+ Java_WebContentsImpl_onDownloadImageFinished(
+ env, obj->obj(), callback->obj(), id,
+ http_status_code, jurl.obj(), jbitmaps.obj(), jsizes.obj());
+}
} // namespace content
« no previous file with comments | « content/browser/web_contents/web_contents_android.h ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698