third_party/WebKit/Source/core/page/FocusController.cpp - Issue 2140733003: [Editing][CodeHealth] Make Node::rootEditableElement static

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 2140733003: [Editing][CodeHealth] Make Node::rootEditableElement static (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 | « third_party/WebKit/Source/core/layout/LayoutBlockFlowLine.cpp ('k') | third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp » ('j') | no next file with comments »
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 f0388e2a568fb19f01d856d077c2850591d3bf15..c7d11a226f30bdcff86214c2462d43f70a5ee4cc 100644

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

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

@@ -1021,7 +1021,7 @@ Element* FocusController::findFocusableElementInShadowHost(const Element& shadow

static bool relinquishesEditingFocus(const Element& element)

{

DCHECK(element.hasEditableStyle());

- return element.document().frame() && element.rootEditableElement();

+ return element.document().frame() && rootEditableElement(element);

}

static void clearSelectionIfNeeded(LocalFrame* oldFocusedFrame, LocalFrame* newFocusedFrame, Element* newFocusedElement)

@@ -1068,7 +1068,7 @@ bool FocusController::setFocusedElement(Element* element, Frame* newFocusedFrame

return true;

// FIXME: Might want to disable this check for caretBrowsing

- if (oldFocusedElement && oldFocusedElement->isRootEditableElement() && !relinquishesEditingFocus(*oldFocusedElement))

+ if (oldFocusedElement && isRootEditableElement(*oldFocusedElement) && !relinquishesEditingFocus(*oldFocusedElement))

return false;

m_page->chromeClient().willSetInputMethodState();