mirror of https://github.com/electron/electron
102 lines
5.2 KiB
Diff
102 lines
5.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kyrylo Hrechykhin <khrechykhin@microsoft.com>
|
|
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 efc25342e674e5b37c8eac0a7f69dc700527af84..0d2533688067461f15ab89ec58f24f89ecf30740 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
|
@@ -2940,6 +2940,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 c30bd4035ea279b0c54beb39a5be86cf02070c75..b7d497e15e42fd904b02025927f08a2031031d35 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
|
@@ -626,6 +626,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 1fd6203a11e5fef9a680e935b44226795932eea2..a3de9dc52df2f8bd2427db235a4ba4a41040ff3b 100644
|
|
--- a/content/browser/renderer_host/text_input_manager.cc
|
|
+++ b/content/browser/renderer_host/text_input_manager.cc
|
|
@@ -166,6 +166,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
|
|
@@ -452,6 +453,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 0c7d5b2c1d3e97420913bd643bb2a524a76fc286..653793fa480f035ce11e079b370bf5ed5cacfa65 100644
|
|
--- a/content/browser/renderer_host/text_input_manager.h
|
|
+++ b/content/browser/renderer_host/text_input_manager.h
|
|
@@ -71,6 +71,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.
|
|
@@ -275,6 +279,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 3557ad8536be31efbeeca9f014baf37e4d545d88..212e17e3f0889d090ae2bf9244279b819352f466 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -8949,7 +8949,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;
|
|
}
|