content/renderer/render_frame_impl.cc - Issue 1423053002: Make document.activeElement work with OOPIF

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1423053002: Make document.activeElement work with OOPIF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@focus-preserve-page-focus-on-subframe-navigations

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/Source/core/dom/TreeScope.cpp » ('j') | third_party/WebKit/Source/core/page/FocusController.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 644a6b6da270fde49a4aa8e450ae04c0801a599a..a778f3dc4da5748049cb62431275a8f632676ac6 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -1699,8 +1699,11 @@ void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) {

frame_->setFrameOwnerSandboxFlags(flags);

}

-void RenderFrameImpl::OnClearFocus() {

- frame_->clearFocus();

+void RenderFrameImpl::OnClearFocus(int focused_frame_routing_id) {

+ RenderFrameProxy* focused_frame_proxy =

+ RenderFrameProxy::FromRoutingID(focused_frame_routing_id);

+ frame_->clearFocus(focused_frame_proxy ? focused_frame_proxy->web_frame()

+ : nullptr);

}

void RenderFrameImpl::OnTextTrackSettingsChanged(