diff options
author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 12:17:38 +0000 |
---|---|---|
committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 12:17:38 +0000 |
commit | 6f6a49447982e0dc1484b2dd983cbcfb50322582 (patch) | |
tree | 35a961af5853f45ee5d7393ceb6e898f2a621d7b | |
parent | dafd8d3b7a55620a8bcfa32fc76b21c1d2e63f1c (diff) | |
download | chromium_src-6f6a49447982e0dc1484b2dd983cbcfb50322582.zip chromium_src-6f6a49447982e0dc1484b2dd983cbcfb50322582.tar.gz chromium_src-6f6a49447982e0dc1484b2dd983cbcfb50322582.tar.bz2 |
Android: moves base/ to use long for JNI.
Follow up from crrev.com/234212
BUG=317523
Review URL: https://codereview.chromium.org/59323004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235725 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | base/android/java/src/org/chromium/base/SystemMessageHandler.java | 8 | ||||
-rw-r--r-- | base/message_loop/message_pump_android.cc | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/base/android/java/src/org/chromium/base/SystemMessageHandler.java b/base/android/java/src/org/chromium/base/SystemMessageHandler.java index fc25ff8..8baf2b0 100644 --- a/base/android/java/src/org/chromium/base/SystemMessageHandler.java +++ b/base/android/java/src/org/chromium/base/SystemMessageHandler.java @@ -16,9 +16,9 @@ class SystemMessageHandler extends Handler { private static final int DELAYED_TIMER_MESSAGE = 2; // Native class pointer set by the constructor of the SharedClient native class. - private int mMessagePumpDelegateNative = 0; + private long mMessagePumpDelegateNative = 0; - private SystemMessageHandler(int messagePumpDelegateNative) { + private SystemMessageHandler(long messagePumpDelegateNative) { mMessagePumpDelegateNative = messagePumpDelegateNative; } @@ -47,9 +47,9 @@ class SystemMessageHandler extends Handler { } @CalledByNative - private static SystemMessageHandler create(int messagePumpDelegateNative) { + private static SystemMessageHandler create(long messagePumpDelegateNative) { return new SystemMessageHandler(messagePumpDelegateNative); } - private native void nativeDoRunLoopOnce(int messagePumpDelegateNative); + private native void nativeDoRunLoopOnce(long messagePumpDelegateNative); } diff --git a/base/message_loop/message_pump_android.cc b/base/message_loop/message_pump_android.cc index f3f1c9b..e756fdd 100644 --- a/base/message_loop/message_pump_android.cc +++ b/base/message_loop/message_pump_android.cc @@ -21,7 +21,7 @@ using base::android::ScopedJavaLocalRef; // ---------------------------------------------------------------------------- // This method can not move to anonymous namespace as it has been declared as // 'static' in system_message_handler_jni.h. -static void DoRunLoopOnce(JNIEnv* env, jobject obj, jint native_delegate) { +static void DoRunLoopOnce(JNIEnv* env, jobject obj, jlong native_delegate) { base::MessagePump::Delegate* delegate = reinterpret_cast<base::MessagePump::Delegate*>(native_delegate); DCHECK(delegate); @@ -81,7 +81,8 @@ void MessagePumpForUI::Start(Delegate* delegate) { DCHECK(env); system_message_handler_obj_.Reset( - Java_SystemMessageHandler_create(env, reinterpret_cast<jint>(delegate))); + Java_SystemMessageHandler_create( + env, reinterpret_cast<intptr_t>(delegate))); } void MessagePumpForUI::Quit() { |