Android: lazy initialization for method id.

webkit/glue/fling_animator_impl_android.cc

 // 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 "webkit/glue/fling_animator_impl_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 
 using namespace base::android;

[joth, 2012/10/04 17:59:59]

oh! this is not allowed is it?

[bulach, 2012/10/04 18:58:17]

aarrggghh!!! :)
done.

 
 namespace webkit_glue {
 
 FlingAnimatorImpl::FlingAnimatorImpl()
     : is_active_(false) {
   // hold the global reference of the Java objects.
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   ScopedJavaLocalRef<jclass> cls(GetClass(env, "android/widget/OverScroller"));
-  jmethodID constructor = GetMethodID(env, cls, "<init>",
-                                      "(Landroid/content/Context;)V");
+  jmethodID constructor = MethodID::Get<

[joth, 2012/10/04 17:59:59]

should at least add the explicit  'using ..MethodID' anyway...

[bulach, 2012/10/04 18:58:17]

added the correct "using" above..

+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, cls.obj(), "<init>", "(Landroid/content/Context;)V");
   ScopedJavaLocalRef<jobject> tmp(env, env->NewObject(cls.obj(), constructor,
                                                       GetApplicationContext()));
   DCHECK(tmp.obj());
   java_scroller_.Reset(tmp);
 
-  fling_method_id_ = GetMethodID(env, cls, "fling", "(IIIIIIII)V");
-  abort_method_id_ = GetMethodID(env, cls, "abortAnimation", "()V");
-  compute_method_id_ = GetMethodID(env, cls, "computeScrollOffset", "()Z");
-  getX_method_id_ = GetMethodID(env, cls, "getCurrX", "()I");
-  getY_method_id_ = GetMethodID(env, cls, "getCurrY", "()I");
+  fling_method_id_ = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, cls.obj(), "fling", "(IIIIIIII)V");
+  abort_method_id_ = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, cls.obj(), "abortAnimation", "()V");
+  compute_method_id_ = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, cls.obj(), "computeScrollOffset", "()Z");
+  getX_method_id_ = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, cls.obj(), "getCurrX", "()I");
+  getY_method_id_ = MethodID::Get<
+      MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(
+          env, cls.obj(), "getCurrY", "()I");
 }
 
 FlingAnimatorImpl::~FlingAnimatorImpl()
 {
 }
 
 void FlingAnimatorImpl::startFling(const WebKit::WebFloatPoint& velocity,
                                    const WebKit::WebRect& /* range */)
 {
   // Ignore "range" as it's always empty -- see http://webkit.org/b/96403
@@ skipping 39 matching lines @@
 {
   JNIEnv* env = AttachCurrentThread();
   WebKit::WebPoint position(
       env->CallIntMethod(java_scroller_.obj(), getX_method_id_),
       env->CallIntMethod(java_scroller_.obj(), getY_method_id_));
   CheckException(env);
   return position;
 }
 
 } // namespace webkit_glue