OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/message_loop/message_pump_android.h" | 5 #include "base/message_loop/message_pump_android.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
11 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "base/time/time.h" | 14 #include "base/time/time.h" |
15 #include "jni/SystemMessageHandler_jni.h" | 15 #include "jni/SystemMessageHandler_jni.h" |
16 | 16 |
17 using base::android::ScopedJavaLocalRef; | 17 using base::android::ScopedJavaLocalRef; |
18 | 18 |
19 // ---------------------------------------------------------------------------- | 19 // ---------------------------------------------------------------------------- |
20 // Native JNI methods called by Java. | 20 // Native JNI methods called by Java. |
21 // ---------------------------------------------------------------------------- | 21 // ---------------------------------------------------------------------------- |
22 // This method can not move to anonymous namespace as it has been declared as | 22 // This method can not move to anonymous namespace as it has been declared as |
23 // 'static' in system_message_handler_jni.h. | 23 // 'static' in system_message_handler_jni.h. |
24 static void DoRunLoopOnce(JNIEnv* env, jobject obj, jint native_delegate) { | 24 static void DoRunLoopOnce(JNIEnv* env, jobject obj, jlong native_delegate) { |
25 base::MessagePump::Delegate* delegate = | 25 base::MessagePump::Delegate* delegate = |
26 reinterpret_cast<base::MessagePump::Delegate*>(native_delegate); | 26 reinterpret_cast<base::MessagePump::Delegate*>(native_delegate); |
27 DCHECK(delegate); | 27 DCHECK(delegate); |
28 // This is based on MessagePumpForUI::DoRunLoop() from desktop. | 28 // This is based on MessagePumpForUI::DoRunLoop() from desktop. |
29 // Note however that our system queue is handled in the java side. | 29 // Note however that our system queue is handled in the java side. |
30 // In desktop we inspect and process a single system message and then | 30 // In desktop we inspect and process a single system message and then |
31 // we call DoWork() / DoDelayedWork(). | 31 // we call DoWork() / DoDelayedWork(). |
32 // On Android, the java message queue may contain messages for other handlers | 32 // On Android, the java message queue may contain messages for other handlers |
33 // that will be processed before calling here again. | 33 // that will be processed before calling here again. |
34 bool did_work = delegate->DoWork(); | 34 bool did_work = delegate->DoWork(); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 // return true (it only returns false if the RunLoop has been Quit already). | 74 // return true (it only returns false if the RunLoop has been Quit already). |
75 if (!run_loop_->BeforeRun()) | 75 if (!run_loop_->BeforeRun()) |
76 NOTREACHED(); | 76 NOTREACHED(); |
77 | 77 |
78 DCHECK(system_message_handler_obj_.is_null()); | 78 DCHECK(system_message_handler_obj_.is_null()); |
79 | 79 |
80 JNIEnv* env = base::android::AttachCurrentThread(); | 80 JNIEnv* env = base::android::AttachCurrentThread(); |
81 DCHECK(env); | 81 DCHECK(env); |
82 | 82 |
83 system_message_handler_obj_.Reset( | 83 system_message_handler_obj_.Reset( |
84 Java_SystemMessageHandler_create(env, reinterpret_cast<jint>(delegate))); | 84 Java_SystemMessageHandler_create( |
| 85 env, reinterpret_cast<intptr_t>(delegate))); |
85 } | 86 } |
86 | 87 |
87 void MessagePumpForUI::Quit() { | 88 void MessagePumpForUI::Quit() { |
88 if (!system_message_handler_obj_.is_null()) { | 89 if (!system_message_handler_obj_.is_null()) { |
89 JNIEnv* env = base::android::AttachCurrentThread(); | 90 JNIEnv* env = base::android::AttachCurrentThread(); |
90 DCHECK(env); | 91 DCHECK(env); |
91 | 92 |
92 Java_SystemMessageHandler_removeTimer(env, | 93 Java_SystemMessageHandler_removeTimer(env, |
93 system_message_handler_obj_.obj()); | 94 system_message_handler_obj_.obj()); |
94 system_message_handler_obj_.Reset(); | 95 system_message_handler_obj_.Reset(); |
(...skipping 29 matching lines...) Expand all Loading... |
124 Java_SystemMessageHandler_setDelayedTimer(env, | 125 Java_SystemMessageHandler_setDelayedTimer(env, |
125 system_message_handler_obj_.obj(), millis); | 126 system_message_handler_obj_.obj(), millis); |
126 } | 127 } |
127 | 128 |
128 // static | 129 // static |
129 bool MessagePumpForUI::RegisterBindings(JNIEnv* env) { | 130 bool MessagePumpForUI::RegisterBindings(JNIEnv* env) { |
130 return RegisterNativesImpl(env); | 131 return RegisterNativesImpl(env); |
131 } | 132 } |
132 | 133 |
133 } // namespace base | 134 } // namespace base |
OLD | NEW |