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

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

Issue 2370253002: Mark calls of visible{Start,End} with dirty layout deprecated (Closed)
Patch Set: 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/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 5d3139d59d7c5f5736ce08cf69cedf60c8e4da36..75a511750603f778f02c9f6a4b1dff32a8d1591e 100644
--- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
@@ -957,8 +957,8 @@ void ReplaceSelectionCommand::mergeEndIfNeeded(EditingState* editingState)
// Merging forward will remove m_endOfInsertedContent from the document.
if (mergeForward) {
if (m_startOfInsertedContent.isOrphan())
- m_startOfInsertedContent = endingSelection().visibleStart().deepEquivalent();
- m_endOfInsertedContent = endingSelection().visibleEnd().deepEquivalent();
+ m_startOfInsertedContent = endingSelection().visibleStartDeprecated().deepEquivalent();
+ m_endOfInsertedContent = endingSelection().visibleEndDeprecated().deepEquivalent();
// If we merged text nodes, m_endOfInsertedContent could be null. If
// this is the case, we use m_startOfInsertedContent.
if (m_endOfInsertedContent.isNull())
@@ -1045,8 +1045,8 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)
m_insertionStyle->mergeTypingStyle(&document());
}
- const VisiblePosition visibleStart = selection.visibleStart();
- const VisiblePosition visibleEnd = selection.visibleEnd();
+ const VisiblePosition visibleStart = selection.visibleStartDeprecated();
+ const VisiblePosition visibleEnd = selection.visibleEndDeprecated();
const bool selectionEndWasEndOfParagraph = isEndOfParagraphDeprecated(visibleEnd);
const bool selectionStartWasStartOfParagraph = isStartOfParagraphDeprecated(visibleStart);
@@ -1078,7 +1078,7 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)
if (editingState->isAborted())
return;
if (fragment.hasInterchangeNewlineAtStart()) {
- VisiblePosition startAfterDelete = endingSelection().visibleStart();
+ VisiblePosition startAfterDelete = endingSelection().visibleStartDeprecated();
if (isEndOfParagraphDeprecated(startAfterDelete) && !isStartOfParagraphDeprecated(startAfterDelete) && !isEndOfEditableOrNonEditableContent(startAfterDelete))
setEndingSelection(nextPositionOf(startAfterDelete));
else
@@ -1102,11 +1102,11 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)
// As long as the div styles are the same, visually you'd expect: <div>xbar</div><div>bar</div><div>bazx</div>,
// not <div>xbar<div>bar</div><div>bazx</div></div>.
// Don't do this if the selection started in a Mail blockquote.
- if (m_preventNesting && !startIsInsideMailBlockquote && !isEndOfParagraphDeprecated(endingSelection().visibleStart()) && !isStartOfParagraphDeprecated(endingSelection().visibleStart())) {
+ if (m_preventNesting && !startIsInsideMailBlockquote && !isEndOfParagraphDeprecated(endingSelection().visibleStartDeprecated()) && !isStartOfParagraphDeprecated(endingSelection().visibleStartDeprecated())) {
insertParagraphSeparator(editingState);
if (editingState->isAborted())
return;
- setEndingSelection(previousPositionOf(endingSelection().visibleStart()));
+ setEndingSelection(previousPositionOf(endingSelection().visibleStartDeprecated()));
}
}
@@ -1361,9 +1361,9 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)
moveParagraph(startOfParagraphToMove, endOfParagraphDeprecated(startOfParagraphToMove), destination, editingState);
if (editingState->isAborted())
return;
- m_startOfInsertedContent = mostForwardCaretPosition(endingSelection().visibleStart().deepEquivalent());
+ m_startOfInsertedContent = mostForwardCaretPosition(endingSelection().visibleStartDeprecated().deepEquivalent());
if (m_endOfInsertedContent.isOrphan())
- m_endOfInsertedContent = mostBackwardCaretPosition(endingSelection().visibleEnd().deepEquivalent());
+ m_endOfInsertedContent = mostBackwardCaretPosition(endingSelection().visibleEndDeprecated().deepEquivalent());
}
Position lastPositionToSelect;
@@ -1380,7 +1380,7 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)
}
setEndingSelection(VisiblePosition::afterNode(insertedNodes.lastLeafInserted()));
// Select up to the paragraph separator that was added.
- lastPositionToSelect = endingSelection().visibleStart().deepEquivalent();
+ lastPositionToSelect = endingSelection().visibleStartDeprecated().deepEquivalent();
} else if (!isStartOfParagraphDeprecated(endOfInsertedContent)) {
setEndingSelection(endOfInsertedContent);
Element* enclosingBlockElement = enclosingBlock(endOfInsertedContent.deepEquivalent().anchorNode());
@@ -1400,7 +1400,7 @@ void ReplaceSelectionCommand::doApply(EditingState* editingState)
}
// Select up to the paragraph separator that was added.
- lastPositionToSelect = endingSelection().visibleStart().deepEquivalent();
+ lastPositionToSelect = endingSelection().visibleStartDeprecated().deepEquivalent();
updateNodesInserted(lastPositionToSelect.anchorNode());
}
} else {

Powered by Google App Engine
This is Rietveld 408576698