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

Unified Diff: chrome/browser/android/feedback/screenshot_task.cc

Issue 2538463002: android: Don't pass ScopedJavaGlobalRef pointers. (Closed)
Patch Set: timeouts are very annoying Created 4 years, 1 month 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/browser/android/feedback/screenshot_task.cc
diff --git a/chrome/browser/android/feedback/screenshot_task.cc b/chrome/browser/android/feedback/screenshot_task.cc
index db79120ec915a46fa7cb53a74aafc36dee9d0257..4e8d3e2a2db6f711650562d19eb56d65b1ff5119 100644
--- a/chrome/browser/android/feedback/screenshot_task.cc
+++ b/chrome/browser/android/feedback/screenshot_task.cc
@@ -18,6 +18,7 @@
using base::android::AttachCurrentThread;
using base::android::JavaParamRef;
+using base::android::JavaRef;
using base::android::ScopedJavaGlobalRef;
using ui::WindowAndroid;
@@ -29,7 +30,7 @@ bool RegisterScreenshotTask(JNIEnv* env) {
}
void SnapshotCallback(JNIEnv* env,
- base::android::ScopedJavaGlobalRef<jobject>* callback,
+ const JavaRef<jobject>& callback,
scoped_refptr<base::RefCountedBytes> png_data) {
jbyteArray jbytes = nullptr;
if (png_data.get()) {
@@ -37,9 +38,7 @@ void SnapshotCallback(JNIEnv* env,
jbytes = env->NewByteArray(size);
env->SetByteArrayRegion(jbytes, 0, size, (jbyte*) png_data->front());
}
- Java_ScreenshotTask_notifySnapshotFinished(env,
- callback->obj(),
- jbytes);
+ Java_ScreenshotTask_notifySnapshotFinished(env, callback, jbytes);
}
void GrabWindowSnapshotAsync(JNIEnv* env,
@@ -52,13 +51,9 @@ void GrabWindowSnapshotAsync(JNIEnv* env,
native_window_android);
gfx::Rect window_bounds(window_width, window_height);
ui::GrabWindowSnapshotAsync(
- window_android,
- window_bounds,
- base::ThreadTaskRunnerHandle::Get(),
- base::Bind(&SnapshotCallback,
- env,
- base::Owned(new ScopedJavaGlobalRef<jobject>(env,
- jcallback))));
+ window_android, window_bounds, base::ThreadTaskRunnerHandle::Get(),
+ base::Bind(&SnapshotCallback, env,
+ ScopedJavaGlobalRef<jobject>(env, jcallback)));
}
} // namespace android
« no previous file with comments | « chrome/browser/android/feedback/connectivity_checker.cc ('k') | chrome/browser/android/large_icon_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698