Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Unified Diff: Source/core/editing/commands/InsertTextCommand.cpp

Issue 1302353002: Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-22T04:51:20 Rebase Created 5 years, 4 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
Index: Source/core/editing/commands/InsertTextCommand.cpp
diff --git a/Source/core/editing/commands/InsertTextCommand.cpp b/Source/core/editing/commands/InsertTextCommand.cpp
index e5d289914f1a60824d40f6c4d298d0665a4bff3b..f750b1abbce6bf56a07495605c7abfd117d69d9d 100644
--- a/Source/core/editing/commands/InsertTextCommand.cpp
+++ b/Source/core/editing/commands/InsertTextCommand.cpp
@@ -156,7 +156,7 @@ void InsertTextCommand::doApply()
// is inserted just before them.
// FIXME: We shouldn't really have to do this, but removing placeholders is a workaround for 9661.
// If the caret is just before a placeholder, downstream will normalize the caret to it.
- Position downstream(startPosition.downstream());
+ Position downstream(mostForwardCaretPosition(startPosition));
if (lineBreakExistsAtPosition(downstream)) {
// FIXME: This doesn't handle placeholders at the end of anonymous blocks.
VisiblePosition caret(startPosition);
@@ -168,17 +168,17 @@ void InsertTextCommand::doApply()
}
// Insert the character at the leftmost candidate.
- startPosition = startPosition.upstream();
+ startPosition = mostBackwardCaretPosition(startPosition);
// It is possible for the node that contains startPosition to contain only unrendered whitespace,
// and so deleteInsignificantText could remove it. Save the position before the node in case that happens.
ASSERT(startPosition.computeContainerNode());
Position positionBeforeStartNode(positionInParentBeforeNode(*startPosition.computeContainerNode()));
- deleteInsignificantText(startPosition, startPosition.downstream());
+ deleteInsignificantText(startPosition, mostForwardCaretPosition(startPosition));
if (!startPosition.inDocument())
startPosition = positionBeforeStartNode;
if (!isVisuallyEquivalentCandidate(startPosition))
- startPosition = startPosition.downstream();
+ startPosition = mostForwardCaretPosition(startPosition);
startPosition = positionAvoidingSpecialElementBoundary(startPosition);

Powered by Google App Engine
This is Rietveld 408576698