base/android/jni_generator/testNativeExportsOnlyOption.golden - Issue 2219923002: JNI: allow either JavaRef or bare objects in Java calls.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/android/jni_generator/testNativeExportsOnlyOption.golden

Issue 2219923002: JNI: allow either JavaRef or bare objects in Java calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove unreachable line Created 4 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

« no previous file with comments | « base/android/jni_generator/testMultipleJNIAdditionalImport.golden ('k') | base/android/jni_generator/testSingleJNIAdditionalImport.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/jni_generator/testNativeExportsOnlyOption.golden

diff --git a/base/android/jni_generator/testNativeExportsOnlyOption.golden b/base/android/jni_generator/testNativeExportsOnlyOption.golden

index a024f875a148f2c097b725967d324a609cf51707..b4c68bbfdf6851d3b37987b4f7685229e0eca11a 100644

--- a/base/android/jni_generator/testNativeExportsOnlyOption.golden

+++ b/base/android/jni_generator/testNativeExportsOnlyOption.golden

@@ -74,9 +74,9 @@ jint

}

static base::subtle::AtomicWord g_SampleForTests_testMethodWithParam = 0;

-static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,

- JniIntWrapper iParam) {

- CHECK_CLAZZ(env, obj,

+static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, const

+ base::android::JavaRefOrBare<jobject>& obj, JniIntWrapper iParam) {

+ CHECK_CLAZZ(env, obj.obj(),

SampleForTests_clazz(env));

jmethodID method_id =

base::android::MethodID::LazyGet<

@@ -90,7 +90,7 @@ static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,

"V",

&g_SampleForTests_testMethodWithParam);

- env->CallVoidMethod(obj,

+ env->CallVoidMethod(obj.obj(),

method_id, as_jint(iParam));

jni_generator::CheckException(env);

@@ -99,9 +99,9 @@ static void Java_SampleForTests_testMethodWithParam(JNIEnv* env, jobject obj,

static base::subtle::AtomicWord g_SampleForTests_testMethodWithParamAndReturn =

static base::android::ScopedJavaLocalRef<jstring>

- Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, jobject obj,

- JniIntWrapper iParam) {

- CHECK_CLAZZ(env, obj,

+ Java_SampleForTests_testMethodWithParamAndReturn(JNIEnv* env, const

+ base::android::JavaRefOrBare<jobject>& obj, JniIntWrapper iParam) {

+ CHECK_CLAZZ(env, obj.obj(),

SampleForTests_clazz(env), NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

@@ -116,7 +116,7 @@ static base::android::ScopedJavaLocalRef<jstring>

&g_SampleForTests_testMethodWithParamAndReturn);

jstring ret =

- static_cast<jstring>(env->CallObjectMethod(obj,

+ static_cast<jstring>(env->CallObjectMethod(obj.obj(),

method_id, as_jint(iParam)));

jni_generator::CheckException(env);

return base::android::ScopedJavaLocalRef<jstring>(env, ret);