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

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some newlines for readability Created 5 years, 4 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: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index dd9bab868ac8c7921370b381c6b292f95a86996b..a1a84e762df42d9d9a215623208d781b26f21494 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1463,19 +1463,17 @@ jlong Init(JNIEnv* env,
return reinterpret_cast<intptr_t>(view);
}
-static jobject FromWebContentsAndroid(
- JNIEnv* env,
- jclass clazz,
- jobject jweb_contents) {
+static ScopedJavaLocalRef<jobject>
+FromWebContentsAndroid(JNIEnv* env, jclass clazz, jobject jweb_contents) {
WebContents* web_contents = WebContents::FromJavaWebContents(jweb_contents);
if (!web_contents)
- return NULL;
+ return ScopedJavaLocalRef<jobject>();
ContentViewCore* view = ContentViewCore::FromWebContents(web_contents);
if (!view)
- return NULL;
+ return ScopedJavaLocalRef<jobject>();
- return view->GetJavaObject().Release();
+ return view->GetJavaObject();
}
bool RegisterContentViewCore(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698