base/android/jni_generator/testFromJavaPGenerics.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/testFromJavaPGenerics.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/testFromJavaP.golden ('k') | base/android/jni_generator/testMultipleJNIAdditionalImport.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/jni_generator/testFromJavaPGenerics.golden

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

index 16e1f390a684fb68644c0f565ff76fc115779327..9272d095f692d1e72d630b3e0ba898796eeb94d6 100644

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

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

@@ -30,10 +30,11 @@ namespace JNI_HashSet {

// Step 2: method stubs.

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

-static void Java_HashSet_dummy(JNIEnv* env, jobject obj) __attribute__

- ((unused));

-static void Java_HashSet_dummy(JNIEnv* env, jobject obj) {

- CHECK_CLAZZ(env, obj,

+static void Java_HashSet_dummy(JNIEnv* env, const

+ base::android::JavaRefOrBare<jobject>& obj) __attribute__ ((unused));

+static void Java_HashSet_dummy(JNIEnv* env, const

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

+ CHECK_CLAZZ(env, obj.obj(),

HashSet_clazz(env));

jmethodID method_id =

base::android::MethodID::LazyGet<

@@ -43,7 +44,7 @@ static void Java_HashSet_dummy(JNIEnv* env, jobject obj) {

"()V",

&g_HashSet_dummy);

- env->CallVoidMethod(obj,

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

method_id);

jni_generator::CheckException(env);