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

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

Issue 2366693005: Mark paragraph-related functions deprecated in VisibleUnits (Closed)
Patch Set: Add output for DCHECK 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
Index: third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp b/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp
index be14efc844e677fc7a76b8770f17d2ff0b2c772e..66f6ef94bd8b2d4f2429c3979e0195fc40ec85f2 100644
--- a/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/IndentOutdentCommand.cpp
@@ -158,8 +158,8 @@ void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Pos
void IndentOutdentCommand::outdentParagraph(EditingState* editingState)
{
- VisiblePosition visibleStartOfParagraph = startOfParagraph(endingSelection().visibleStart());
- VisiblePosition visibleEndOfParagraph = endOfParagraph(visibleStartOfParagraph);
+ VisiblePosition visibleStartOfParagraph = startOfParagraphDeprecated(endingSelection().visibleStart());
+ VisiblePosition visibleEndOfParagraph = endOfParagraphDeprecated(visibleStartOfParagraph);
HTMLElement* enclosingElement = toHTMLElement(enclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), &isHTMLListOrBlockquoteElement));
if (!enclosingElement || !hasEditableStyle(*enclosingElement->parentNode())) // We can't outdent if there is no place to go!
@@ -203,12 +203,12 @@ void IndentOutdentCommand::outdentParagraph(EditingState* editingState)
document().updateStyleAndLayoutIgnorePendingStylesheets();
visibleStartOfParagraph = createVisiblePositionDeprecated(visibleStartOfParagraph.deepEquivalent());
visibleEndOfParagraph = createVisiblePositionDeprecated(visibleEndOfParagraph.deepEquivalent());
- if (visibleStartOfParagraph.isNotNull() && !isStartOfParagraph(visibleStartOfParagraph)) {
+ if (visibleStartOfParagraph.isNotNull() && !isStartOfParagraphDeprecated(visibleStartOfParagraph)) {
insertNodeAt(HTMLBRElement::create(document()), visibleStartOfParagraph.deepEquivalent(), editingState);
if (editingState->isAborted())
return;
}
- if (visibleEndOfParagraph.isNotNull() && !isEndOfParagraph(visibleEndOfParagraph))
+ if (visibleEndOfParagraph.isNotNull() && !isEndOfParagraphDeprecated(visibleEndOfParagraph))
insertNodeAt(HTMLBRElement::create(document()), visibleEndOfParagraph.deepEquivalent(), editingState);
return;
}
@@ -222,8 +222,8 @@ void IndentOutdentCommand::outdentParagraph(EditingState* editingState)
splitElement(enclosingElement, highestInlineNode ? highestInlineNode : visibleStartOfParagraph.deepEquivalent().anchorNode());
}
}
- VisiblePosition startOfParagraphToMove = startOfParagraph(visibleStartOfParagraph);
- VisiblePosition endOfParagraphToMove = endOfParagraph(visibleEndOfParagraph);
+ VisiblePosition startOfParagraphToMove = startOfParagraphDeprecated(visibleStartOfParagraph);
+ VisiblePosition endOfParagraphToMove = endOfParagraphDeprecated(visibleEndOfParagraph);
if (startOfParagraphToMove.isNull() || endOfParagraphToMove.isNull())
return;
HTMLBRElement* placeholder = HTMLBRElement::create(document());
@@ -236,8 +236,8 @@ void IndentOutdentCommand::outdentParagraph(EditingState* editingState)
// FIXME: We should merge this function with ApplyBlockElementCommand::formatSelection
void IndentOutdentCommand::outdentRegion(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection, EditingState* editingState)
{
- VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection);
- VisiblePosition endOfLastParagraph = endOfParagraph(endOfSelection);
+ VisiblePosition endOfCurrentParagraph = endOfParagraphDeprecated(startOfSelection);
+ VisiblePosition endOfLastParagraph = endOfParagraphDeprecated(endOfSelection);
if (endOfCurrentParagraph.deepEquivalent() == endOfLastParagraph.deepEquivalent()) {
outdentParagraph(editingState);
@@ -245,10 +245,10 @@ void IndentOutdentCommand::outdentRegion(const VisiblePosition& startOfSelection
}
Position originalSelectionEnd = endingSelection().end();
- VisiblePosition endAfterSelection = endOfParagraph(nextPositionOf(endOfLastParagraph));
+ VisiblePosition endAfterSelection = endOfParagraphDeprecated(nextPositionOf(endOfLastParagraph));
while (endOfCurrentParagraph.deepEquivalent() != endAfterSelection.deepEquivalent()) {
- VisiblePosition endOfNextParagraph = endOfParagraph(nextPositionOf(endOfCurrentParagraph));
+ VisiblePosition endOfNextParagraph = endOfParagraphDeprecated(nextPositionOf(endOfCurrentParagraph));
if (endOfCurrentParagraph.deepEquivalent() == endOfLastParagraph.deepEquivalent())
setEndingSelection(VisibleSelection(originalSelectionEnd, TextAffinity::Downstream));
else
@@ -266,7 +266,7 @@ void IndentOutdentCommand::outdentRegion(const VisiblePosition& startOfSelection
if (endOfNextParagraph.isNotNull() && !endOfNextParagraph.deepEquivalent().isConnected()) {
endOfCurrentParagraph = createVisiblePositionDeprecated(endingSelection().end());
- endOfNextParagraph = endOfParagraph(nextPositionOf(endOfCurrentParagraph));
+ endOfNextParagraph = endOfParagraphDeprecated(nextPositionOf(endOfCurrentParagraph));
}
endOfCurrentParagraph = endOfNextParagraph;
}

Powered by Google App Engine
This is Rietveld 408576698