Build Android's MessagePumpForUI by upstreaming SystemMessageHandler

base/message_pump_android.cc

-// Copyright (c) 2011 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.
 
 #include "base/message_pump_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
+#include "base/android/scoped_java_ref.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "jni/system_message_handler_jni.h"
 
-using base::android::ScopedJavaReference;
+using base::android::ScopedJavaLocalRef;
 
 namespace {
 
-const char* kClassPathName = "com/android/chromeview/base/SystemMessageHandler";
+const char kClassPathName[] = "org/chromium/base/SystemMessageHandler";

[bulach, 2012/03/14 17:03:07]

no longer used? could remove downstream too..

[Peter Beverloo, 2012/03/14 19:49:40]

Done.

 
-jobject g_system_message_handler_obj = NULL;
+base::LazyInstance<base::android::ScopedJavaGlobalRef<jobject> >
+    g_system_message_handler_obj = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // ----------------------------------------------------------------------------
 // Native JNI methods called by Java.
 // ----------------------------------------------------------------------------
 // This method can not move to anonymous namespace as it has been declared as
 // 'static' in system_message_handler_jni.h.
 static jboolean DoRunLoopOnce(JNIEnv* env, jobject obj, jint native_delegate) {
   base::MessagePump::Delegate* delegate =
@@ skipping 16 matching lines @@
   // the callstack, and post a message to call us back soon.
   if (more_work_is_plausible)
     return true;
 
   more_work_is_plausible = delegate->DoIdleWork();
   if (!more_work_is_plausible && !delayed_work_time.is_null()) {
     // We only set the timer here as returning true would post a message.
     jlong millis =
         (delayed_work_time - base::TimeTicks::Now()).InMillisecondsRoundedUp();
     Java_SystemMessageHandler_setDelayedTimer(env, obj, millis);
-    base::android::CheckException(env);
   }
   return more_work_is_plausible;
 }
 
 namespace base {
 
 MessagePumpForUI::MessagePumpForUI()
     : state_(NULL) {
 }
 
 MessagePumpForUI::~MessagePumpForUI() {
 }
 
 void MessagePumpForUI::Run(Delegate* delegate) {
   NOTREACHED() << "UnitTests should rely on MessagePumpForUIStub in"
       " test_stub_android.h";
 }
 
 void MessagePumpForUI::Start(Delegate* delegate) {
   state_ = new MessageLoop::AutoRunState(MessageLoop::current());
 
-  DCHECK(!g_system_message_handler_obj);
+  DCHECK(g_system_message_handler_obj.Get().is_null());
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
-  jclass clazz = env->FindClass(kClassPathName);
-  DCHECK(clazz);
-
-  jmethodID constructor = base::android::GetMethodID(env, clazz, "<init>",
-                                                     "(I)V");
-  ScopedJavaReference<jobject> client(env, env->NewObject(clazz, constructor,
-                                                          delegate));
-  DCHECK(client.obj());
-
-  g_system_message_handler_obj = env->NewGlobalRef(client.obj());
-
-  base::android::CheckException(env);
+  g_system_message_handler_obj.Get().Reset(
+      Java_SystemMessageHandler_create(env, reinterpret_cast<jint>(delegate)));
 }
 
 void MessagePumpForUI::Quit() {
-  if (g_system_message_handler_obj) {
+  if (!g_system_message_handler_obj.Get().is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     DCHECK(env);
 
-    Java_SystemMessageHandler_removeTimer(env, g_system_message_handler_obj);
-    env->DeleteGlobalRef(g_system_message_handler_obj);
-    base::android::CheckException(env);
-    g_system_message_handler_obj = NULL;
+    Java_SystemMessageHandler_removeTimer(env,
+        g_system_message_handler_obj.Get().obj());
+    g_system_message_handler_obj.Get().Reset();
   }
 
   if (state_) {
     delete state_;
     state_ = NULL;
   }
 }
 
 void MessagePumpForUI::ScheduleWork() {
-  if (!g_system_message_handler_obj)
+  if (g_system_message_handler_obj.Get().is_null())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
-  Java_SystemMessageHandler_setTimer(env, g_system_message_handler_obj);
-  base::android::CheckException(env);
-
+  Java_SystemMessageHandler_setTimer(env,
+      g_system_message_handler_obj.Get().obj());
 }
 
 void MessagePumpForUI::ScheduleDelayedWork(const TimeTicks& delayed_work_time) {
-  if (!g_system_message_handler_obj)
+  if (g_system_message_handler_obj.Get().is_null())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
 
   jlong millis =
       (delayed_work_time - base::TimeTicks::Now()).InMillisecondsRoundedUp();
   // Note that we're truncating to milliseconds as required by the java side,
   // even though delayed_work_time is microseconds resolution.
-  Java_SystemMessageHandler_setDelayedTimer(env, g_system_message_handler_obj,
-                                            millis);
-  base::android::CheckException(env);
+  Java_SystemMessageHandler_setDelayedTimer(env,
+      g_system_message_handler_obj.Get().obj(), millis);
 }
 
 // Register native methods
 bool RegisterSystemMessageHandler(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace base