third_party/WebKit/Source/core/editing/VisibleSelection.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/VisibleSelection.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/InputMethodController.cpp ('k') | third_party/WebKit/Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 22543f46569d0e4bcef20eaf20b12bb3a213e02f..4000482c8ca27007e3c5bfdb8c3514b8451ee353 100644

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

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

@@ -859,7 +859,7 @@ void VisibleSelectionTemplate<Strategy>::adjustSelectionToAvoidCrossingEditingBo

if (p.isNull() && shadowAncestor)

p = PositionTemplate<Strategy>::afterNode(shadowAncestor);

while (p.isNotNull() && !(lowestEditableAncestor(p.computeContainerNode()) == baseEditableAncestor && !isEditablePosition(p))) {

- Element* root = editableRootElementForPosition(p);

+ Element* root = rootEditableElementOf(p);

shadowAncestor = root ? root->shadowHost() : nullptr;

p = isAtomicNode(p.computeContainerNode()) ? PositionTemplate<Strategy>::inParentBeforeNode(*p.computeContainerNode()) : previousVisuallyDistinctCandidate(p);

if (p.isNull() && shadowAncestor)

@@ -888,7 +888,7 @@ void VisibleSelectionTemplate<Strategy>::adjustSelectionToAvoidCrossingEditingBo

if (p.isNull() && shadowAncestor)

p = PositionTemplate<Strategy>::beforeNode(shadowAncestor);

while (p.isNotNull() && !(lowestEditableAncestor(p.computeContainerNode()) == baseEditableAncestor && !isEditablePosition(p))) {

- Element* root = editableRootElementForPosition(p);

+ Element* root = rootEditableElementOf(p);

shadowAncestor = root ? root->shadowHost() : nullptr;

p = isAtomicNode(p.computeContainerNode()) ? PositionTemplate<Strategy>::inParentAfterNode(*p.computeContainerNode()) : nextVisuallyDistinctCandidate(p);

if (p.isNull() && shadowAncestor)

@@ -962,7 +962,7 @@ bool VisibleSelectionTemplate<Strategy>::isContentRichlyEditable() const

template <typename Strategy>

Element* VisibleSelectionTemplate<Strategy>::rootEditableElement() const

{

- return editableRootElementForPosition(start());

+ return rootEditableElementOf(start());

}

template <typename Strategy>