| Index: ui/platform_window/android/platform_ime_controller_android.cc
|
| diff --git a/ui/platform_window/android/platform_ime_controller_android.cc b/ui/platform_window/android/platform_ime_controller_android.cc
|
| index 58a04ec95835bb9c153fb7d1d786e15d7d38b4a2..67c8d321dd06e2691e6da4bf8a47f35b3309ef57 100644
|
| --- a/ui/platform_window/android/platform_ime_controller_android.cc
|
| +++ b/ui/platform_window/android/platform_ime_controller_android.cc
|
| @@ -28,12 +28,14 @@ void PlatformImeControllerAndroid::Init(JNIEnv* env, jobject jobj) {
|
|
|
| void PlatformImeControllerAndroid::UpdateTextInputState(
|
| const TextInputState& state) {
|
| - if (java_platform_ime_controller_android_.is_empty())
|
| - return;
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| + ScopedJavaLocalRef<jobject> scoped_obj =
|
| + java_platform_ime_controller_android_.get(env);
|
| + if (scoped_obj.is_null())
|
| + return;
|
| Java_PlatformImeControllerAndroid_updateTextInputState(
|
| env,
|
| - java_platform_ime_controller_android_.get(env).obj(),
|
| + scoped_obj.obj(),
|
| state.type,
|
| state.flags,
|
| base::android::ConvertUTF8ToJavaString(env, state.text).obj(),
|
| @@ -44,13 +46,13 @@ void PlatformImeControllerAndroid::UpdateTextInputState(
|
| }
|
|
|
| void PlatformImeControllerAndroid::SetImeVisibility(bool visible) {
|
| - if (java_platform_ime_controller_android_.is_empty())
|
| - return;
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| + ScopedJavaLocalRef<jobject> scoped_obj =
|
| + java_platform_ime_controller_android_.get(env);
|
| + if (scoped_obj.is_null())
|
| + return;
|
| Java_PlatformImeControllerAndroid_setImeVisibility(
|
| - env,
|
| - java_platform_ime_controller_android_.get(env).obj(),
|
| - visible);
|
| + env, scoped_obj.obj(), visible);
|
| }
|
|
|
| } // namespace ui
|
|
|