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

Unified Diff: base/android/jni_generator/testMultipleJNIAdditionalImport.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
Index: base/android/jni_generator/testMultipleJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
index 48c1616b6c1c6124c50d84386d1b5325b82f1a86..629afa1f197480e7981b12ea01d12b2885dd4433 100644
--- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
@@ -42,8 +42,9 @@ void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller,
}
static base::subtle::AtomicWord g_Foo_calledByNative = 0;
-static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
- jobject callback2) {
+static void Java_Foo_calledByNative(JNIEnv* env, const
+ base::android::JavaRefOrBare<jobject>& callback1,
+ const base::android::JavaRefOrBare<jobject>& callback2) {
CHECK_CLAZZ(env, Foo_clazz(env),
Foo_clazz(env));
jmethodID method_id =
@@ -60,7 +61,7 @@ static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
&g_Foo_calledByNative);
env->CallStaticVoidMethod(Foo_clazz(env),
- method_id, callback1, callback2);
+ method_id, callback1.obj(), callback2.obj());
jni_generator::CheckException(env);
}
« no previous file with comments | « base/android/jni_generator/testFromJavaPGenerics.golden ('k') | base/android/jni_generator/testNativeExportsOnlyOption.golden » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698