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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 115103002: Android: sync up latest JNI generator changes from downstream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adds extra params Created 6 years, 11 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/testEagerCalledByNativesOption.golden ('k') | base/android/jni_generator/testFromJavaPGenerics.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/jni_generator/testFromJavaP.golden
diff --git a/base/android/jni_generator/testFromJavaP.golden b/base/android/jni_generator/testFromJavaP.golden
index 3797d3e4e3e624aa3807134053e50610ec747c7e..d30acb1641f7ce86b6102ad20a80245c2ba8bfb1 100644
--- a/base/android/jni_generator/testFromJavaP.golden
+++ b/base/android/jni_generator/testFromJavaP.golden
@@ -1,4 +1,4 @@
-// Copyright 2013 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.
@@ -12,18 +12,14 @@
#include <jni.h>
-#include "base/android/jni_android.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
-#include "base/logging.h"
-
-using base::android::ScopedJavaLocalRef;
+#include "base/android/jni_generator/jni_generator_helper.h"
// Step 1: forward declarations.
namespace {
const char kInputStreamClassPath[] = "java/io/InputStream";
// Leaking this jclass as we cannot use LazyInstance from some threads.
jclass g_InputStream_clazz = NULL;
+
} // namespace
namespace JNI_InputStream {
@@ -35,7 +31,8 @@ static jint Java_InputStream_available(JNIEnv* env, jobject obj) __attribute__
((unused));
static jint Java_InputStream_available(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -45,9 +42,9 @@ static jint Java_InputStream_available(JNIEnv* env, jobject obj) {
&g_InputStream_available);
jint ret =
- env->CallIntMethod(obj,
- method_id);
- base::android::CheckException(env);
+ env->CallIntMethod(obj,
+ method_id);
+ jni_generator::CheckException(env);
return ret;
}
@@ -56,7 +53,8 @@ static void Java_InputStream_close(JNIEnv* env, jobject obj) __attribute__
((unused));
static void Java_InputStream_close(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -65,9 +63,9 @@ static void Java_InputStream_close(JNIEnv* env, jobject obj) {
"()V",
&g_InputStream_close);
- env->CallVoidMethod(obj,
- method_id);
- base::android::CheckException(env);
+ env->CallVoidMethod(obj,
+ method_id);
+ jni_generator::CheckException(env);
}
@@ -76,7 +74,8 @@ static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0)
__attribute__ ((unused));
static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -85,9 +84,9 @@ static void Java_InputStream_mark(JNIEnv* env, jobject obj, jint p0) {
"(I)V",
&g_InputStream_mark);
- env->CallVoidMethod(obj,
- method_id, p0);
- base::android::CheckException(env);
+ env->CallVoidMethod(obj,
+ method_id, p0);
+ jni_generator::CheckException(env);
}
@@ -96,7 +95,8 @@ static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj)
__attribute__ ((unused));
static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz, false);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -106,9 +106,9 @@ static jboolean Java_InputStream_markSupported(JNIEnv* env, jobject obj) {
&g_InputStream_markSupported);
jboolean ret =
- env->CallBooleanMethod(obj,
- method_id);
- base::android::CheckException(env);
+ env->CallBooleanMethod(obj,
+ method_id);
+ jni_generator::CheckException(env);
return ret;
}
@@ -117,7 +117,8 @@ static jint Java_InputStream_readI(JNIEnv* env, jobject obj) __attribute__
((unused));
static jint Java_InputStream_readI(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -127,9 +128,9 @@ static jint Java_InputStream_readI(JNIEnv* env, jobject obj) {
&g_InputStream_readI);
jint ret =
- env->CallIntMethod(obj,
- method_id);
- base::android::CheckException(env);
+ env->CallIntMethod(obj,
+ method_id);
+ jni_generator::CheckException(env);
return ret;
}
@@ -138,7 +139,8 @@ static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0)
__attribute__ ((unused));
static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -148,9 +150,9 @@ static jint Java_InputStream_readI_AB(JNIEnv* env, jobject obj, jbyteArray p0) {
&g_InputStream_readI_AB);
jint ret =
- env->CallIntMethod(obj,
- method_id, p0);
- base::android::CheckException(env);
+ env->CallIntMethod(obj,
+ method_id, p0);
+ jni_generator::CheckException(env);
return ret;
}
@@ -164,7 +166,8 @@ static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
jint p1,
jint p2) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -174,9 +177,9 @@ static jint Java_InputStream_readI_AB_I_I(JNIEnv* env, jobject obj, jbyteArray
&g_InputStream_readI_AB_I_I);
jint ret =
- env->CallIntMethod(obj,
- method_id, p0, p1, p2);
- base::android::CheckException(env);
+ env->CallIntMethod(obj,
+ method_id, p0, p1, p2);
+ jni_generator::CheckException(env);
return ret;
}
@@ -185,7 +188,8 @@ static void Java_InputStream_reset(JNIEnv* env, jobject obj) __attribute__
((unused));
static void Java_InputStream_reset(JNIEnv* env, jobject obj) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -194,9 +198,9 @@ static void Java_InputStream_reset(JNIEnv* env, jobject obj) {
"()V",
&g_InputStream_reset);
- env->CallVoidMethod(obj,
- method_id);
- base::android::CheckException(env);
+ env->CallVoidMethod(obj,
+ method_id);
+ jni_generator::CheckException(env);
}
@@ -205,7 +209,8 @@ static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0)
__attribute__ ((unused));
static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, obj,
+ g_InputStream_clazz, 0);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -215,18 +220,20 @@ static jlong Java_InputStream_skip(JNIEnv* env, jobject obj, jlong p0) {
&g_InputStream_skip);
jlong ret =
- env->CallLongMethod(obj,
- method_id, p0);
- base::android::CheckException(env);
+ env->CallLongMethod(obj,
+ method_id, p0);
+ jni_generator::CheckException(env);
return ret;
}
static base::subtle::AtomicWord g_InputStream_Constructor = 0;
-static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env)
- __attribute__ ((unused));
-static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env) {
+static base::android::ScopedJavaLocalRef<jobject>
+ Java_InputStream_Constructor(JNIEnv* env) __attribute__ ((unused));
+static base::android::ScopedJavaLocalRef<jobject>
+ Java_InputStream_Constructor(JNIEnv* env) {
/* Must call RegisterNativesImpl() */
- DCHECK(g_InputStream_clazz);
+ CHECK_CLAZZ(env, g_InputStream_clazz,
+ g_InputStream_clazz, NULL);
jmethodID method_id =
base::android::MethodID::LazyGet<
base::android::MethodID::TYPE_INSTANCE>(
@@ -236,20 +243,21 @@ static ScopedJavaLocalRef<jobject> Java_InputStream_Constructor(JNIEnv* env) {
&g_InputStream_Constructor);
jobject ret =
- env->NewObject(g_InputStream_clazz,
- method_id);
- base::android::CheckException(env);
- return ScopedJavaLocalRef<jobject>(env, ret);
+ env->NewObject(g_InputStream_clazz,
+ method_id);
+ jni_generator::CheckException(env);
+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);
}
// Step 3: RegisterNatives.
static bool RegisterNativesImpl(JNIEnv* env) {
-
g_InputStream_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(
base::android::GetClass(env, kInputStreamClassPath).obj()));
+
return true;
}
+
} // namespace JNI_InputStream
#endif // java_io_InputStream_JNI
« no previous file with comments | « base/android/jni_generator/testEagerCalledByNativesOption.golden ('k') | base/android/jni_generator/testFromJavaPGenerics.golden » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698