| Index: content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_event_handler.cc b/content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
| index 0401ce699cc82e53ffd698e046c6a9d32fac574a..f0c1e1cbb08940c969609a249cd5d1efebbe7c67 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_event_handler.cc
|
| @@ -626,12 +626,11 @@ bool RenderWidgetHostViewEventHandler::CanRendererHandleEvent(
|
| }
|
|
|
| void RenderWidgetHostViewEventHandler::FinishImeCompositionSession() {
|
| - if (!host_view_->GetTextInputClient()->HasCompositionText())
|
| - return;
|
| -
|
| - TextInputManager* text_input_manager = host_view_->GetTextInputManager();
|
| - if (!!text_input_manager && !!text_input_manager->GetActiveWidget())
|
| - text_input_manager->GetActiveWidget()->ImeFinishComposingText(false);
|
| + // RenderWidgetHostViewAura keeps track of existing composition texts. The
|
| + // call to finish composition text should be made through the RWHVA itself
|
| + // otherwise the following call to cancel composition will lead to an extra
|
| + // IPC for finishing the ongoing composition (see https://crbug.com/723024).
|
| + host_view_->GetTextInputClient()->ConfirmCompositionText();
|
| host_view_->ImeCancelComposition();
|
| }
|
|
|
|
|