third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp - Issue 1997563002: Get rid of a redundant function alias positionBeforeNode()

Unified Diff: third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

Issue 1997563002: Get rid of a redundant function alias positionBeforeNode() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 2016-05-19T22:35:34 rebase Created 4 years, 7 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/commands/InsertParagraphSeparatorCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/TypingCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

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

index 649e9eb99ce1977fae480b6927fcdad10b886ff5..2323a3bb129bf45d0f59d83f36c4ab69671f44e2 100644

--- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

+++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

@@ -909,7 +909,7 @@ void ReplaceSelectionCommand::mergeEndIfNeeded(EditingState* editingState)

insertNodeBefore(placeholder, startOfParagraphToMove.deepEquivalent().anchorNode(), editingState);

if (editingState->isAborted())

return;

- destination = createVisiblePosition(positionBeforeNode(placeholder));

+ destination = createVisiblePosition(Position::beforeNode(placeholder));

}

moveParagraph(startOfParagraphToMove, endOfParagraph(startOfParagraphToMove), destination, editingState);

@@ -1103,7 +1103,7 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)

HTMLBRElement* endBR = isHTMLBRElement(*mostForwardCaretPosition(insertionPos).anchorNode()) ? toHTMLBRElement(mostForwardCaretPosition(insertionPos).anchorNode()) : 0;

VisiblePosition originalVisPosBeforeEndBR;

if (endBR)

- originalVisPosBeforeEndBR = previousPositionOf(createVisiblePosition(positionBeforeNode(endBR)));

+ originalVisPosBeforeEndBR = previousPositionOf(createVisiblePosition(Position::beforeNode(endBR)));

Element* enclosingBlockOfInsertionPos = enclosingBlock(insertionPos.anchorNode());

@@ -1397,7 +1397,7 @@ bool ReplaceSelectionCommand::shouldRemoveEndBR(HTMLBRElement* endBR, const Visi

if (!endBR || !endBR->inShadowIncludingDocument())

return false;

- VisiblePosition visiblePos = createVisiblePosition(positionBeforeNode(endBR));

+ VisiblePosition visiblePos = createVisiblePosition(Position::beforeNode(endBR));

// Don't remove the br if nothing was inserted.

if (previousPositionOf(visiblePos).deepEquivalent() == originalVisPosBeforeEndBR.deepEquivalent())

@@ -1686,7 +1686,7 @@ bool ReplaceSelectionCommand::performTrivialReplace(const ReplacementFragment& f

return false;

if (nodeAfterInsertionPos && nodeAfterInsertionPos->parentNode() && isHTMLBRElement(*nodeAfterInsertionPos)

- && shouldRemoveEndBR(toHTMLBRElement(nodeAfterInsertionPos), createVisiblePosition(positionBeforeNode(nodeAfterInsertionPos)))) {

+ && shouldRemoveEndBR(toHTMLBRElement(nodeAfterInsertionPos), createVisiblePosition(Position::beforeNode(nodeAfterInsertionPos)))) {

removeNodeAndPruneAncestors(nodeAfterInsertionPos, editingState);

if (editingState->isAborted())

return false;