From 703c6edb09d051247c96dcab87201171e4eae5d0 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 17:22:27 +0000 Subject: [PATCH 1/2] fix: on-screen-keyboard hides on input blurred in webview Co-authored-by: Kyrylo Hrechykhin --- patches/chromium/.patches | 1 + ...board_hides_on_input_blur_in_webview.patch | 59 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index ccabe51f4093a..aaef487629f5c 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -128,3 +128,4 @@ create_browser_v8_snapshot_file_name_fuse.patch cherry-pick-1eb1e18ad41d.patch cherry-pick-05a0d99c9715.patch cherry-pick-c83640db21b5.patch +fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch new file mode 100644 index 0000000000000..b065f747f969a --- /dev/null +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -0,0 +1,59 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kyrylo Hrechykhin +Date: Thu, 6 Oct 2022 18:30:53 +0200 +Subject: fix: on-screen-keyboard hides on input blur in webview + +Changes introduced by this patch fix issue where OSK does not hide on +input rendered inside webview is blurred. This patch should be removed +when proper fix in chromium repo is available. + +Note: the issue still occurs if input rendered in webview blurred due +to touch outside of webview. It is caused by webview implementation +details. Specificaly due to webview has its own tree nodes and focused +node does not change in this case. + +chromium-bug: https://crbug.com/1369605 + +diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/content/browser/renderer_host/render_widget_host_view_child_frame.cc +index beb340cc38c2f82c224793b26813bead85817c85..f43fbd03646406255845cfbb02ce31d3602edf2a 100644 +--- a/content/browser/renderer_host/render_widget_host_view_child_frame.cc ++++ b/content/browser/renderer_host/render_widget_host_view_child_frame.cc +@@ -992,6 +992,12 @@ RenderWidgetHostViewChildFrame::DidUpdateVisualProperties( + return viz::ScopedSurfaceIdAllocator(std::move(allocation_task)); + } + ++void RenderWidgetHostViewChildFrame::FocusedNodeChanged( ++ bool is_editable_node, ++ const gfx::Rect& node_bounds_in_screen) { ++ NOTREACHED(); ++} ++ + ui::TextInputType RenderWidgetHostViewChildFrame::GetTextInputType() const { + if (!text_input_manager_) + return ui::TEXT_INPUT_TYPE_NONE; +diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h +index f7f9a981003ba1e3fefc9fc0f2b2bcf921c0a4d5..cd69daf186a6ec22fb70a2a36568e544524d025f 100644 +--- a/content/browser/renderer_host/render_widget_host_view_child_frame.h ++++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h +@@ -181,6 +181,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame + void DisableAutoResize(const gfx::Size& new_size) override; + viz::ScopedSurfaceIdAllocator DidUpdateVisualProperties( + const cc::RenderFrameMetadata& metadata) override; ++ void FocusedNodeChanged(bool is_editable_node, ++ const gfx::Rect& node_bounds_in_screen) override; + + // RenderFrameMetadataProvider::Observer implementation. + void OnRenderFrameMetadataChangedBeforeActivation( +diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc +index 6c99fee1af1bcd64f3e6647132bd132f0ea111ec..a5d175b17cdae078997bf081fa36106bb5885779 100644 +--- a/content/browser/web_contents/web_contents_impl.cc ++++ b/content/browser/web_contents/web_contents_impl.cc +@@ -7926,7 +7926,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( + "WebContentsImpl::OnFocusedElementChangedInFrame", + "render_frame_host", frame); + RenderWidgetHostViewBase* root_view = +- static_cast(GetRenderWidgetHostView()); ++ static_cast(GetTopLevelRenderWidgetHostView()); + if (!root_view || !frame->GetView()) + return; + // Convert to screen coordinates from window coordinates by adding the From eac730de73e7861c20ad3f9f84b982d683a98ca2 Mon Sep 17 00:00:00 2001 From: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 17:36:58 +0000 Subject: [PATCH 2/2] chore: update patches --- ...een-keyboard_hides_on_input_blur_in_webview.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch index b065f747f969a..82c4b734fdbde 100644 --- a/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch +++ b/patches/chromium/fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch @@ -15,10 +15,10 @@ node does not change in this case. chromium-bug: https://crbug.com/1369605 diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/content/browser/renderer_host/render_widget_host_view_child_frame.cc -index beb340cc38c2f82c224793b26813bead85817c85..f43fbd03646406255845cfbb02ce31d3602edf2a 100644 +index c56d5c06ca3eb5e2c11bd1af00a8667bfa422dc9..bccc940958180481947a5a5ee82562bd99d28b78 100644 --- a/content/browser/renderer_host/render_widget_host_view_child_frame.cc +++ b/content/browser/renderer_host/render_widget_host_view_child_frame.cc -@@ -992,6 +992,12 @@ RenderWidgetHostViewChildFrame::DidUpdateVisualProperties( +@@ -985,6 +985,12 @@ RenderWidgetHostViewChildFrame::DidUpdateVisualProperties( return viz::ScopedSurfaceIdAllocator(std::move(allocation_task)); } @@ -32,10 +32,10 @@ index beb340cc38c2f82c224793b26813bead85817c85..f43fbd03646406255845cfbb02ce31d3 if (!text_input_manager_) return ui::TEXT_INPUT_TYPE_NONE; diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h -index f7f9a981003ba1e3fefc9fc0f2b2bcf921c0a4d5..cd69daf186a6ec22fb70a2a36568e544524d025f 100644 +index 457dabe428e84230b2e831e9281feee06e7c8e76..9436d55b390ac6fa16398efebad0a87beef6e959 100644 --- a/content/browser/renderer_host/render_widget_host_view_child_frame.h +++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h -@@ -181,6 +181,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame +@@ -178,6 +178,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame void DisableAutoResize(const gfx::Size& new_size) override; viz::ScopedSurfaceIdAllocator DidUpdateVisualProperties( const cc::RenderFrameMetadata& metadata) override; @@ -45,10 +45,10 @@ index f7f9a981003ba1e3fefc9fc0f2b2bcf921c0a4d5..cd69daf186a6ec22fb70a2a36568e544 // RenderFrameMetadataProvider::Observer implementation. void OnRenderFrameMetadataChangedBeforeActivation( diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 6c99fee1af1bcd64f3e6647132bd132f0ea111ec..a5d175b17cdae078997bf081fa36106bb5885779 100644 +index 8982a2a4d2be23e56472b17e9d59e289e8255336..92f73106ba8c9559281add6fe7a2f2a613ca3cdc 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -7926,7 +7926,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( +@@ -7891,7 +7891,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame( "WebContentsImpl::OnFocusedElementChangedInFrame", "render_frame_host", frame); RenderWidgetHostViewBase* root_view =