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) { ...@@ -512,9 +512,10 @@ bool TypingCommand::makeEditableRootEmpty(EditingState* editingState) {
addBlockPlaceholderIfNeeded(root, editingState); addBlockPlaceholderIfNeeded(root, editingState);
if (editingState->isAborted()) if (editingState->isAborted())
return false; return false;
setEndingSelection(createVisibleSelectionDeprecated( document().updateStyleAndLayoutIgnorePendingStylesheets();
Position::firstPositionInNode(root), TextAffinity::Downstream, setEndingSelection(createVisibleSelection(Position::firstPositionInNode(root),
endingSelection().isDirectional())); TextAffinity::Downstream,
endingSelection().isDirectional()));
return true; return true;
} }
...@@ -557,7 +558,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity, ...@@ -557,7 +558,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity,
selectionModifier.modify(FrameSelection::AlterationExtend, selectionModifier.modify(FrameSelection::AlterationExtend,
DirectionBackward, CharacterGranularity); DirectionBackward, CharacterGranularity);
VisiblePosition visibleStart(endingSelection().visibleStartDeprecated()); VisiblePosition visibleStart(endingSelection().visibleStart());
if (previousPositionOf(visibleStart, CannotCrossEditingBoundary) if (previousPositionOf(visibleStart, CannotCrossEditingBoundary)
.isNull()) { .isNull()) {
// When the caret is at the start of the editable area in an empty list // When the caret is at the start of the editable area in an empty list
...@@ -593,7 +594,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity, ...@@ -593,7 +594,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity,
// If the caret is at the start of a paragraph after a table, move content // If the caret is at the start of a paragraph after a table, move content
// into the last table cell. // into the last table cell.
if (isStartOfParagraphDeprecated(visibleStart) && if (isStartOfParagraph(visibleStart) &&
tableElementJustBefore( tableElementJustBefore(
previousPositionOf(visibleStart, CannotCrossEditingBoundary))) { previousPositionOf(visibleStart, CannotCrossEditingBoundary))) {
// Unless the caret is just before a table. We don't want to move a // Unless the caret is just before a table. We don't want to move a
...@@ -607,7 +608,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity, ...@@ -607,7 +608,7 @@ void TypingCommand::deleteKeyPressed(TextGranularity granularity,
// If the caret is just after a table, select the table and don't delete // If the caret is just after a table, select the table and don't delete
// anything. // anything.
} else if (Element* table = tableElementJustBefore(visibleStart)) { } else if (Element* table = tableElementJustBefore(visibleStart)) {
setEndingSelection(createVisibleSelectionDeprecated( setEndingSelection(createVisibleSelection(
Position::beforeNode(table), endingSelection().start(), Position::beforeNode(table), endingSelection().start(),
TextAffinity::Downstream, endingSelection().isDirectional())); TextAffinity::Downstream, endingSelection().isDirectional()));
typingAddedToOpenCommand(DeleteKey); typingAddedToOpenCommand(DeleteKey);
...@@ -707,7 +708,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, ...@@ -707,7 +708,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
Position downstreamEnd = Position downstreamEnd =
mostForwardCaretPosition(endingSelection().end()); mostForwardCaretPosition(endingSelection().end());
VisiblePosition visibleEnd = endingSelection().visibleEndDeprecated(); VisiblePosition visibleEnd = endingSelection().visibleEnd();
Node* enclosingTableCell = Node* enclosingTableCell =
enclosingNodeOfType(visibleEnd.deepEquivalent(), &isTableCell); enclosingNodeOfType(visibleEnd.deepEquivalent(), &isTableCell);
if (enclosingTableCell && if (enclosingTableCell &&
...@@ -716,7 +717,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, ...@@ -716,7 +717,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
.deepEquivalent()) .deepEquivalent())
return; return;
if (visibleEnd.deepEquivalent() == if (visibleEnd.deepEquivalent() ==
endOfParagraphDeprecated(visibleEnd).deepEquivalent()) endOfParagraph(visibleEnd).deepEquivalent())
downstreamEnd = mostForwardCaretPosition( downstreamEnd = mostForwardCaretPosition(
nextPositionOf(visibleEnd, CannotCrossEditingBoundary) nextPositionOf(visibleEnd, CannotCrossEditingBoundary)
.deepEquivalent()); .deepEquivalent());
...@@ -724,7 +725,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, ...@@ -724,7 +725,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
if (isDisplayInsideTable(downstreamEnd.computeContainerNode()) && if (isDisplayInsideTable(downstreamEnd.computeContainerNode()) &&
downstreamEnd.computeOffsetInContainerNode() <= downstreamEnd.computeOffsetInContainerNode() <=
caretMinOffset(downstreamEnd.computeContainerNode())) { caretMinOffset(downstreamEnd.computeContainerNode())) {
setEndingSelection(createVisibleSelectionDeprecated( setEndingSelection(createVisibleSelection(
endingSelection().end(), endingSelection().end(),
Position::afterNode(downstreamEnd.computeContainerNode()), Position::afterNode(downstreamEnd.computeContainerNode()),
TextAffinity::Downstream, endingSelection().isDirectional())); TextAffinity::Downstream, endingSelection().isDirectional()));
...@@ -736,8 +737,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, ...@@ -736,8 +737,7 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity,
// the next paragraph (if any) // the next paragraph (if any)
if (granularity == ParagraphBoundary && if (granularity == ParagraphBoundary &&
selectionModifier.selection().isCaret() && selectionModifier.selection().isCaret() &&
isEndOfParagraphDeprecated( isEndOfParagraph(selectionModifier.selection().visibleEnd()))
selectionModifier.selection().visibleEndDeprecated()))
selectionModifier.modify(FrameSelection::AlterationExtend, selectionModifier.modify(FrameSelection::AlterationExtend,
DirectionForward, CharacterGranularity); 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