third_party/WebKit/Source/core/page/FocusController.cpp - 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: third_party/WebKit/Source/core/page/FocusController.cpp

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

« third_party/WebKit/Source/core/page/FocusController.h ('K') | « third_party/WebKit/Source/core/page/FocusController.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.h » ('j') | third_party/WebKit/public/web/WebLocalFrame.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/FocusController.cpp

diff --git a/third_party/WebKit/Source/core/page/FocusController.cpp b/third_party/WebKit/Source/core/page/FocusController.cpp

index f068696572f020fc0f025ca104c2c817b472dd91..1addc9deb9bb9c78a7a8f7e5624c179290d83e7f 100644

--- a/third_party/WebKit/Source/core/page/FocusController.cpp

+++ b/third_party/WebKit/Source/core/page/FocusController.cpp

@@ -832,7 +832,8 @@ bool FocusController::setFocusedElement(Element* element, PassRefPtrWillBeRawPtr

if (newDocument && oldDocument == newDocument && newDocument->focusedElement() == element)

return true;

- clearSelectionIfNeeded(oldFocusedFrame.get(), toLocalFrame(newFocusedFrame.get()), element);

+ if (newFocusedFrame && newFocusedFrame->isLocalFrame())

+ clearSelectionIfNeeded(oldFocusedFrame.get(), toLocalFrame(newFocusedFrame.get()), element);

if (oldDocument && oldDocument != newDocument)

oldDocument->setFocusedElement(nullptr);