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 844797a0f880354f590b84bf354d7f9375b2c31f..d251b241582208b21096d3e2ab650b9e1012c380 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 @@ -1000,6 +1000,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 ed0641b888c6421b1791c086466bd9c158e9109d..3760b3823d5af3325017bb53f5b1d38e6d9091d8 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 a515cff65ec418ccd44bccd61b0cf8094cb864db..4345ec56895124c50651462386f3fad45fb651bb 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -8277,7 +8277,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