third_party/WebKit/Source/core/editing/VisibleSelection.cpp - Issue 2327743002: Rename Node::shadowHost() to Node::ownerShadowHost()

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 2327743002: Rename Node::shadowHost() to Node::ownerShadowHost() (Closed)

Patch Set: fix Created 4 years, 3 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/editing/Position.cpp ('k') | third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.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 a1c795838b31f5a1b647dcc81338ef75a9c2bb67..58ec207a07a309d215849aa69c980e53c884d938 100644

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

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

@@ -642,12 +642,12 @@ void VisibleSelectionTemplate<Strategy>::adjustSelectionToAvoidCrossingEditingBo

if (endRoot || endEditableAncestor != baseEditableAncestor) {

PositionTemplate<Strategy>p = previousVisuallyDistinctCandidate(m_end);

- Element* shadowAncestor = endRoot ? endRoot->shadowHost() : nullptr;

+ Element* shadowAncestor = endRoot ? endRoot->ownerShadowHost() : nullptr;

if (p.isNull() && shadowAncestor)

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

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

Element* root = rootEditableElementOf(p);

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

+ shadowAncestor = root ? root->ownerShadowHost() : nullptr;

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

if (p.isNull() && shadowAncestor)

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

@@ -671,12 +671,12 @@ void VisibleSelectionTemplate<Strategy>::adjustSelectionToAvoidCrossingEditingBo

Element* startEditableAncestor = lowestEditableAncestor(m_start.computeContainerNode());

if (startRoot || startEditableAncestor != baseEditableAncestor) {

PositionTemplate<Strategy> p = nextVisuallyDistinctCandidate(m_start);

- Element* shadowAncestor = startRoot ? startRoot->shadowHost() : nullptr;

+ Element* shadowAncestor = startRoot ? startRoot->ownerShadowHost() : nullptr;

if (p.isNull() && shadowAncestor)

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

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

Element* root = rootEditableElementOf(p);

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

+ shadowAncestor = root ? root->ownerShadowHost() : nullptr;

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

if (p.isNull() && shadowAncestor)

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