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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/base/android/jni_generator/testCalledByNatives.golden

Issue 492713002: Revert 290810 "Make class lookup lazy in jni_generator when usin..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/base/android/jni_generator/jni_generator.py ('k') | trunk/src/base/android/jni_generator/testConstantsFromJavaP.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/base/android/jni_generator/testCalledByNatives.golden
===================================================================
--- trunk/src/base/android/jni_generator/testCalledByNatives.golden (revision 290812)
+++ trunk/src/base/android/jni_generator/testCalledByNatives.golden (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -20,19 +20,10 @@
namespace {
const char kTestJniClassPath[] = "org/chromium/TestJni";
const char kInfoBarClassPath[] = "org/chromium/TestJni$InfoBar";
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-function"
-#endif
// Leaking this jclass as we cannot use LazyInstance from some threads.
jclass g_TestJni_clazz = NULL;
-jclass TestJni_clazz(JNIEnv*) { return g_TestJni_clazz; }
// Leaking this jclass as we cannot use LazyInstance from some threads.
jclass g_InfoBar_clazz = NULL;
-jclass InfoBar_clazz(JNIEnv*) { return g_InfoBar_clazz; }
-#if __clang__
-#pragma clang diagnostic pop
-#endif
} // namespace
@@ -48,11 +39,11 @@
jobject icon) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"showConfirmInfoBar",
"("
@@ -82,11 +73,11 @@
jstring args) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"showAutoLoginInfoBar",
"("
@@ -109,11 +100,11 @@
static void Java_InfoBar_dismiss(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- InfoBar_clazz(env));
+ g_InfoBar_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, InfoBar_clazz(env),
+ env, g_InfoBar_clazz,
"dismiss",
"("
@@ -133,12 +124,12 @@
jstring account,
jstring args) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, TestJni_clazz(env),
- TestJni_clazz(env), false);
+ CHECK_CLAZZ(env, g_TestJni_clazz,
+ g_TestJni_clazz, false);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"shouldShowAutoLogin",
"("
@@ -151,7 +142,7 @@
&g_TestJni_shouldShowAutoLogin);
jboolean ret =
- env->CallStaticBooleanMethod(TestJni_clazz(env),
+ env->CallStaticBooleanMethod(g_TestJni_clazz,
method_id, view, realm, account, args);
jni_generator::CheckException(env);
return ret;
@@ -161,12 +152,12 @@
static base::android::ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv*
env, jstring url) {
/* Must call RegisterNativesImpl() */
- CHECK_CLAZZ(env, TestJni_clazz(env),
- TestJni_clazz(env), NULL);
+ CHECK_CLAZZ(env, g_TestJni_clazz,
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_STATIC>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"openUrl",
"("
@@ -176,7 +167,7 @@
&g_TestJni_openUrl);
jobject ret =
- env->CallStaticObjectMethod(TestJni_clazz(env),
+ env->CallStaticObjectMethod(g_TestJni_clazz,
method_id, url);
jni_generator::CheckException(env);
return base::android::ScopedJavaLocalRef<jobject>(env, ret);
@@ -191,11 +182,11 @@
JniIntWrapper iSecondaryID) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env));
+ g_TestJni_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"activateHardwareAcceleration",
"("
@@ -220,11 +211,11 @@
iParam) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env));
+ g_TestJni_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"uncheckedCall",
"("
@@ -243,11 +234,11 @@
Java_TestJni_returnByteArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnByteArray",
"("
@@ -267,11 +258,11 @@
Java_TestJni_returnBooleanArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnBooleanArray",
"("
@@ -291,11 +282,11 @@
Java_TestJni_returnCharArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnCharArray",
"("
@@ -315,11 +306,11 @@
Java_TestJni_returnShortArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnShortArray",
"("
@@ -339,11 +330,11 @@
Java_TestJni_returnIntArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnIntArray",
"("
@@ -363,11 +354,11 @@
Java_TestJni_returnLongArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnLongArray",
"("
@@ -387,11 +378,11 @@
Java_TestJni_returnDoubleArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnDoubleArray",
"("
@@ -411,11 +402,11 @@
Java_TestJni_returnObjectArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnObjectArray",
"("
@@ -435,11 +426,11 @@
Java_TestJni_returnArrayOfByteArray(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"returnArrayOfByteArray",
"("
@@ -459,11 +450,11 @@
Java_TestJni_getCompressFormat(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"getCompressFormat",
"("
@@ -483,11 +474,11 @@
Java_TestJni_getCompressFormatList(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
CHECK_CLAZZ(env, obj,
- TestJni_clazz(env), NULL);
+ g_TestJni_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
- env, TestJni_clazz(env),
+ env, g_TestJni_clazz,
"getCompressFormatList",
"("
« no previous file with comments | « trunk/src/base/android/jni_generator/jni_generator.py ('k') | trunk/src/base/android/jni_generator/testConstantsFromJavaP.golden » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698