Commit cf43a066 authored by xiaochengh's avatar xiaochengh Committed by Commit bot

Prune deprecated functions from TypingCommand

BUG=648949,651373

Review-Url: https://codereview.chromium.org/2393353004
Cr-Commit-Position: refs/heads/master@{#423801}
parent dcc5d049
......@@ -512,9 +512,10 @@ bool TypingCommand::makeEditableRootEmpty(EditingState* editingState) {
addBlockPlaceholderIfNeeded(root, editingState);
if (editingState->isAborted())
return false;
setEndingSelection(createVisibleSelectionDeprecated(
Position::firstPositionInNode(root), TextAffinity::Downstream,
endingSelection().isDirectional()));
document().updateStyleAndLayoutIgnorePendingStylesheets();
setEndingSelection(createVisibleSelection(Position::firstPositionInNode(root),
TextAffinity::Downstream,
endingSelection().isDirectional()));
return true;
}
......@@ -557,7 +558,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity,
selectionModifier.modify(FrameSelection::AlterationExtend,
DirectionBackward, CharacterGranularity);
VisiblePosition visibleStart(endingSelection().visibleStartDeprecated());
VisiblePosition visibleStart(endingSelection().visibleStart());
if (previousPositionOf(visibleStart, CannotCrossEditingBoundary)
.isNull()) {
// When the caret is at the start of the editable area in an empty list
......@@ -593,7 +594,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity,
// If the caret is at the start of a paragraph after a table, move content
// into the last table cell.
if (isStartOfParagraphDeprecated(visibleStart) &&
if (isStartOfParagraph(visibleStart) &&
tableElementJustBefore(
previousPositionOf(visibleStart, CannotCrossEditingBoundary))) {
// Unless the caret is just before a table. We don't want to move a
......@@ -607,7 +608,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity,
// If the caret is just after a table, select the table and don't delete
// anything.
} else if (Element* table = tableElementJustBefore(visibleStart)) {
setEndingSelection(createVisibleSelectionDeprecated(
setEndingSelection(createVisibleSelection(
Position::beforeNode(table), endingSelection().start(),
TextAffinity::Downstream, endingSelection().isDirectional()));
typingAddedToOpenCommand(DeleteKey);
......@@ -707,7 +708,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
Position downstreamEnd =
mostForwardCaretPosition(endingSelection().end());
VisiblePosition visibleEnd = endingSelection().visibleEndDeprecated();
VisiblePosition visibleEnd = endingSelection().visibleEnd();
Node* enclosingTableCell =
enclosingNodeOfType(visibleEnd.deepEquivalent(), &isTableCell);
if (enclosingTableCell &&
......@@ -716,7 +717,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
.deepEquivalent())
return;
if (visibleEnd.deepEquivalent() ==
endOfParagraphDeprecated(visibleEnd).deepEquivalent())
endOfParagraph(visibleEnd).deepEquivalent())
downstreamEnd = mostForwardCaretPosition(
nextPositionOf(visibleEnd, CannotCrossEditingBoundary)
.deepEquivalent());
......@@ -724,7 +725,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
if (isDisplayInsideTable(downstreamEnd.computeContainerNode()) &&
downstreamEnd.computeOffsetInContainerNode() <=
caretMinOffset(downstreamEnd.computeContainerNode())) {
setEndingSelection(createVisibleSelectionDeprecated(
setEndingSelection(createVisibleSelection(
endingSelection().end(),
Position::afterNode(downstreamEnd.computeContainerNode()),
TextAffinity::Downstream, endingSelection().isDirectional()));
......@@ -736,8 +737,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
// the next paragraph (if any)
if (granularity == ParagraphBoundary &&
selectionModifier.selection().isCaret() &&
isEndOfParagraphDeprecated(
selectionModifier.selection().visibleEndDeprecated()))
isEndOfParagraph(selectionModifier.selection().visibleEnd()))
selectionModifier.modify(FrameSelection::AlterationExtend,
DirectionForward, CharacterGranularity);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment