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

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

Issue 267893002: Catch intptr_t to int conversion on 64-bit platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/testEagerCalledByNativesOption.golden
diff --git a/base/android/jni_generator/testEagerCalledByNativesOption.golden b/base/android/jni_generator/testEagerCalledByNativesOption.golden
index f57abeef50e2df987260b3d0aced6b1d6e1640ec..8bfae274c96365c69a931705bae89b55db931254 100644
--- a/base/android/jni_generator/testEagerCalledByNativesOption.golden
+++ b/base/android/jni_generator/testEagerCalledByNativesOption.golden
@@ -1,4 +1,4 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 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.
@@ -14,6 +14,8 @@
#include "base/android/jni_generator/jni_generator_helper.h"
+#include "base/android/jni_int_wrapper.h"
+
// Step 1: forward declarations.
namespace {
const char kTestClassPath[] = "org/chromium/example/jni_generator/Test";
@@ -36,15 +38,16 @@ static jint Method(JNIEnv* env, jobject jcaller,
namespace {
-static void testMethodWithParam(JNIEnv* env, jobject obj, jint iParam) {
+static void testMethodWithParam(JNIEnv* env, jobject obj, jni_int_wrapper
+ iParam) {
env->CallVoidMethod(obj,
- g_Test_testMethodWithParam, iParam);
+ g_Test_testMethodWithParam, iParam.asJint());
}
-static jint testStaticMethodWithParam(JNIEnv* env, jint iParam) {
+static jint testStaticMethodWithParam(JNIEnv* env, jni_int_wrapper iParam) {
jint ret = env->CallStaticIntMethod(g_Test_clazz,
- g_Test_testStaticMethodWithParam, iParam);
+ g_Test_testStaticMethodWithParam, iParam.asJint());
return ret;
}

Powered by Google App Engine
This is Rietveld 408576698