123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Kyrylo Hrechykhin <[email protected]>
- Date: Thu, 6 Oct 2022 18:30:53 +0200
- Subject: fix: on-screen-keyboard hides on input blur in webview
- Work around OSK not hiding by notifying RenderWidgetHostViewAura of
- focus node change via TextInputManager.
- chromium-bug: https://crbug.com/1369605
- diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
- index 7e9f2e71f08c1324a805462064d4fa485041c19f..2b4543ca40eac0f56c6408e27aac523827093724 100644
- --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
- +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
- @@ -3220,6 +3220,12 @@ void RenderWidgetHostViewAura::OnTextSelectionChanged(
- }
- }
-
- +void RenderWidgetHostViewAura::OnFocusedInputElementChanged(
- + TextInputManager* text_input_manager,
- + RenderWidgetHostViewBase* view) {
- + FocusedNodeChanged(false, {});
- +}
- +
- void RenderWidgetHostViewAura::SetPopupChild(
- RenderWidgetHostViewAura* popup_child_host_view) {
- popup_child_host_view_ = popup_child_host_view;
- diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
- index 06fc7daf2761ae728f3adf9eb2ef3910a14cf827..8d34f9dfd9a8625a3fab397f7b96c12c87cb8a61 100644
- --- a/content/browser/renderer_host/render_widget_host_view_aura.h
- +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
- @@ -653,6 +653,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
- RenderWidgetHostViewBase* updated_view) override;
- void OnTextSelectionChanged(TextInputManager* text_input_mangager,
- RenderWidgetHostViewBase* updated_view) override;
- + void OnFocusedInputElementChanged(TextInputManager* text_input_manager,
- + RenderWidgetHostViewBase* view) override;
-
- // Detaches |this| from the input method object.
- // is_removed flag is true if this is called while the window is
- diff --git a/content/browser/renderer_host/text_input_manager.cc b/content/browser/renderer_host/text_input_manager.cc
- index 4f1d98e960b58cf417d53c487f7eafa2b15c2c1e..1de7a9b74555e01e17ea89ac457dc4d011001a3c 100644
- --- a/content/browser/renderer_host/text_input_manager.cc
- +++ b/content/browser/renderer_host/text_input_manager.cc
- @@ -183,6 +183,7 @@ void TextInputManager::UpdateTextInputState(
-
- if (text_input_state.type == ui::TEXT_INPUT_TYPE_NONE &&
- active_view_ != view) {
- + NotifyFocusedInputElementChanged(active_view_);
- // We reached here because an IPC is received to reset the TextInputState
- // for |view|. But |view| != |active_view_|, which suggests that at least
- // one other view has become active and we have received the corresponding
- @@ -473,6 +474,12 @@ void TextInputManager::NotifyObserversAboutInputStateUpdate(
- observer.OnUpdateTextInputStateCalled(this, updated_view, did_update_state);
- }
-
- +void TextInputManager::NotifyFocusedInputElementChanged(
- + RenderWidgetHostViewBase* view) {
- + for (auto& observer : observer_list_)
- + observer.OnFocusedInputElementChanged(this, view);
- +}
- +
- TextInputManager::SelectionRegion::SelectionRegion() = default;
-
- TextInputManager::SelectionRegion::SelectionRegion(
- diff --git a/content/browser/renderer_host/text_input_manager.h b/content/browser/renderer_host/text_input_manager.h
- index 75df43e3cd2721a92c90c18154d53d5c203e2465..ce42c75c8face36d21f53f44c0201ac46df71d6a 100644
- --- a/content/browser/renderer_host/text_input_manager.h
- +++ b/content/browser/renderer_host/text_input_manager.h
- @@ -69,6 +69,10 @@ class CONTENT_EXPORT TextInputManager {
- virtual void OnTextSelectionChanged(
- TextInputManager* text_input_manager,
- RenderWidgetHostViewBase* updated_view) {}
- + // Called when focused input element has changed
- + virtual void OnFocusedInputElementChanged(
- + TextInputManager* text_input_manager,
- + RenderWidgetHostViewBase* updated_view) {}
- };
-
- // Text selection bounds.
- @@ -304,6 +308,7 @@ class CONTENT_EXPORT TextInputManager {
-
- void NotifyObserversAboutInputStateUpdate(RenderWidgetHostViewBase* view,
- bool did_update_state);
- + void NotifyFocusedInputElementChanged(RenderWidgetHostViewBase* view);
-
- // The view with active text input state, i.e., a focused <input> element.
- // It will be nullptr if no such view exists. Note that the active view
- diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
- index c3b563b0b727bc35f6d4499c589110644ebe9cd1..6010d9f9fc9bfeffb3e5a64de7352b52a202cbf7 100644
- --- a/content/browser/web_contents/web_contents_impl.cc
- +++ b/content/browser/web_contents/web_contents_impl.cc
- @@ -9772,7 +9772,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
- "WebContentsImpl::OnFocusedElementChangedInFrame",
- "render_frame_host", frame);
- RenderWidgetHostViewBase* root_view =
- - static_cast<RenderWidgetHostViewBase*>(GetRenderWidgetHostView());
- + static_cast<RenderWidgetHostViewBase*>(GetTopLevelRenderWidgetHostView());
- if (!root_view || !frame->GetView()) {
- return;
- }
|