chrome/browser/android/chrome_web_contents_delegate_android.cc - Issue 11038015: Android: lazy initialization for method id.

Unified Diff: chrome/browser/android/chrome_web_contents_delegate_android.cc

Issue 11038015: Android: lazy initialization for method id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Moves to MethodID Created 8 years, 2 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

« base/android/jni_generator/jni_generator.py ('K') | « base/android/locale_utils.cc ('k') | chrome/browser/android/provider/chrome_browser_provider.cc » ('j') | chrome/browser/history/android/sqlite_cursor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_web_contents_delegate_android.cc

diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc

index a7de6d71995e9979c9647a7ff38f45febca37e0f..b5af3730a3855326ca204fbe221f1f919bb95adc 100644

--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc

+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc

@@ -22,6 +22,7 @@

using base::android::AttachCurrentThread;

using base::android::GetClass;

+using base::android::MethodID;

using base::android::ScopedJavaLocalRef;

using content::FileChooserParams;

using content::WebContents;

@@ -140,8 +141,9 @@ void ChromeWebContentsDelegateAndroid::OnFindResultAvailable(

ScopedJavaLocalRef<jclass> rect_clazz =

GetClass(env, "android/graphics/Rect");

- jmethodID rect_constructor =

- GetMethodID(env, rect_clazz, "<init>", "(IIII)V");

+ jmethodID rect_constructor = MethodID::Get<

+ MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(

+ env, rect_clazz.obj(), "<init>", "(IIII)V");

ScopedJavaLocalRef<jobject> selection_rect = CreateAndroidRect(

env, rect_clazz, rect_constructor, find_result->selection_rect());

@@ -150,8 +152,9 @@ void ChromeWebContentsDelegateAndroid::OnFindResultAvailable(

ScopedJavaLocalRef<jclass> details_clazz =

GetClass(env, "org/chromium/chrome/browser/FindNotificationDetails");

- jmethodID details_constructor = GetMethodID(env, details_clazz, "<init>",

- "(ILandroid/graphics/Rect;IZ)V");

+ jmethodID details_constructor = MethodID::Get<

+ MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(

+ env, details_clazz.obj(), "<init>", "(ILandroid/graphics/Rect;IZ)V");

ScopedJavaLocalRef<jobject> details_object(

env,

@@ -189,8 +192,9 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply(

ScopedJavaLocalRef<jclass> rect_clazz =

GetClass(env, "android/graphics/RectF");

- jmethodID rect_constructor =

- GetMethodID(env, rect_clazz, "<init>", "(FFFF)V");

+ jmethodID rect_constructor = MethodID::Get<

+ MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(

+ env, rect_clazz.obj(), "<init>", "(FFFF)V");

ScopedJavaLocalRef<jobjectArray> jrects(env, env->NewObjectArray(

match_rects.rects().size(), rect_clazz.obj(), NULL));

@@ -211,8 +215,10 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply(

ScopedJavaLocalRef<jclass> details_clazz =

GetClass(env, "org/chromium/chrome/browser/FindMatchRectsDetails");

- jmethodID details_constructor = GetMethodID(env, details_clazz, "<init>",

- "(I[Landroid/graphics/RectF;Landroid/graphics/RectF;)V");

+ jmethodID details_constructor = MethodID::Get<

+ MethodID::METHODTYPE_NORMAL, MethodID::EXCEPTIONCHECK_YES>(

+ env, details_clazz.obj(), "<init>",

+ "(I[Landroid/graphics/RectF;Landroid/graphics/RectF;)V");

ScopedJavaLocalRef<jobject> details_object(

env,