Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index 8b52e6b82c8d723bb996be39900b6bc717f75384..0f81ca52bdb380621b8b95fafec9d78bb37c1c63 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -660,13 +660,11 @@ void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { |
// is TabContentsDelegate. |
} |
-long RenderWidgetHostViewAndroid::GetNativeImeAdapter() { |
- return reinterpret_cast<intptr_t>(&ime_adapter_android_); |
-} |
+void RenderWidgetHostViewAndroid::NotifyTextInputStateChanged() { |
+ RenderWidgetHostViewBase::NotifyTextInputStateChanged(); |
-void RenderWidgetHostViewAndroid::TextInputStateChanged( |
- const ViewHostMsg_TextInputState_Params& params) { |
- if (params.is_non_ime_change) { |
+ const TextInputState* state = GetCurrentTextInputState(); |
+ if (state->is_non_ime_change) { |
// Sends an acknowledgement to the renderer of a processed IME event. |
host_->Send(new InputMsg_ImeEventAck(host_->GetRoutingID())); |
} |
@@ -675,11 +673,14 @@ void RenderWidgetHostViewAndroid::TextInputStateChanged( |
return; |
content_view_core_->UpdateImeAdapter( |
- GetNativeImeAdapter(), |
- static_cast<int>(params.type), params.flags, |
- params.value, params.selection_start, params.selection_end, |
- params.composition_start, params.composition_end, |
- params.show_ime_if_needed, params.is_non_ime_change); |
+ GetNativeImeAdapter(), static_cast<int>(state->type), state->flags, |
+ state->value, state->selection_start, state->selection_end, |
+ state->composition_start, state->composition_end, |
+ state->show_ime_if_needed, state->is_non_ime_change); |
+} |
+ |
+long RenderWidgetHostViewAndroid::GetNativeImeAdapter() { |
+ return reinterpret_cast<intptr_t>(&ime_adapter_android_); |
} |
void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) { |