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

Unified Diff: android/jni_generator/testNativeExportsOption.golden

Issue 2050803003: Update to Chromium //base at Chromium commit e3a753f17bac62738b0dbf0b36510f767b081e4b. (Closed) Base URL: https://github.com/domokit/base.git@master
Patch Set: Created 4 years, 6 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: android/jni_generator/testNativeExportsOption.golden
diff --git a/android/jni_generator/testNativeExportsOption.golden b/android/jni_generator/testNativeExportsOption.golden
index 68736adaf392eb2b6a94e1bbe38273429754a869..13cd2b94a3b81997879504f01f9a7f9556afe39b 100644
--- a/android/jni_generator/testNativeExportsOption.golden
+++ b/android/jni_generator/testNativeExportsOption.golden
@@ -36,7 +36,7 @@ jint
jint arg1) {
Test* native = reinterpret_cast<Test*>(nativeTest);
CHECK_NATIVE_PTR(env, jcaller, native, "StaticMethod", 0);
- return native->StaticMethod(env, jcaller, arg1);
+ return native->StaticMethod(env, JavaParamRef<jobject>(env, jcaller), arg1);
}
extern "C" __attribute__((visibility("default")))
@@ -48,25 +48,25 @@ jint
jint arg1) {
Test* native = reinterpret_cast<Test*>(nativeTest);
CHECK_NATIVE_PTR(env, jcaller, native, "Method", 0);
- return native->Method(env, jcaller, arg1);
+ return native->Method(env, JavaParamRef<jobject>(env, jcaller), arg1);
}
-static jint Init(JNIEnv* env, jobject jcaller);
+static jint Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller);
extern "C" __attribute__((visibility("default")))
jint
Java_org_chromium_example_jni_1generator_SampleForTests_00024MyInnerClass_nativeInit(JNIEnv*
env, jobject jcaller) {
- return Init(env, jcaller);
+ return Init(env, JavaParamRef<jobject>(env, jcaller));
}
-static jint Init(JNIEnv* env, jobject jcaller);
+static jint Init(JNIEnv* env, const JavaParamRef<jobject>& jcaller);
extern "C" __attribute__((visibility("default")))
jint
Java_org_chromium_example_jni_1generator_SampleForTests_00024MyOtherInnerClass_nativeInit(JNIEnv*
env, jobject jcaller) {
- return Init(env, jcaller);
+ return Init(env, JavaParamRef<jobject>(env, jcaller));
}
static base::subtle::AtomicWord g_SampleForTests_testMethodWithParam = 0;

Powered by Google App Engine
This is Rietveld 408576698