third_party/WebKit/Source/core/editing/VisibleUnits.cpp - Issue 1611953002: Rename editableRootElementForPosition() to rootEditableElementOf()

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/editing/VisibleUnits.cpp

Issue 1611953002: Rename editableRootElementForPosition() to rootEditableElementOf() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 2016-01-21T18:23:57 Created 4 years, 11 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/editing/EditingUtilities.cpp ('K') | « third_party/WebKit/Source/core/editing/VisibleSelection.cpp ('k') | third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/VisibleUnits.cpp

diff --git a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp

index c0c782d05229538a0e83f5cada41032c03ecd736..088a6df8bd61fff9180c7cc203c282279048378b 100644

--- a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp

+++ b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp

@@ -126,7 +126,7 @@ static PositionType canonicalPosition(const PositionType& passedPosition)

if (node && node->document().documentElement() == node && !node->hasEditableStyle() && node->document().body() && node->document().body()->hasEditableStyle())

return next.isNotNull() ? next : prev;

- Element* editingRoot = editableRootElementForPosition(position);

+ Element* editingRoot = rootEditableElementOf(position);

// If the html element is editable, descending into its body will look like

// a descent from non-editable to editable content since

@@ -134,8 +134,8 @@ static PositionType canonicalPosition(const PositionType& passedPosition)

if ((editingRoot && editingRoot->document().documentElement() == editingRoot) || position.anchorNode()->isDocumentNode())

return next.isNotNull() ? next : prev;

- bool prevIsInSameEditableElement = prevNode && editableRootElementForPosition(prev) == editingRoot;

- bool nextIsInSameEditableElement = nextNode && editableRootElementForPosition(next) == editingRoot;

+ bool prevIsInSameEditableElement = prevNode && rootEditableElementOf(prev) == editingRoot;

+ bool nextIsInSameEditableElement = nextNode && rootEditableElementOf(next) == editingRoot;

if (prevIsInSameEditableElement && !nextIsInSameEditableElement)

return prev;