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

Unified Diff: third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.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/DeleteSelectionCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
index c2614e5db7ac9ee1518d313168510d24652391d6..3f934463a738c67a88679c683ec4dffcee6db4f7 100644
--- a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
@@ -129,7 +129,7 @@ void DeleteSelectionCommand::initializeStartEnd(Position& start, Position& end)
if (!startSpecialContainer && !endSpecialContainer)
break;
- if (createVisiblePositionDeprecated(start).deepEquivalent() != m_selectionToDelete.visibleStart().deepEquivalent() || createVisiblePositionDeprecated(end).deepEquivalent() != m_selectionToDelete.visibleEnd().deepEquivalent())
+ if (createVisiblePositionDeprecated(start).deepEquivalent() != m_selectionToDelete.visibleStartDeprecated().deepEquivalent() || createVisiblePositionDeprecated(end).deepEquivalent() != m_selectionToDelete.visibleEndDeprecated().deepEquivalent())
break;
// If we're going to expand to include the startSpecialContainer, it must be fully selected.
@@ -844,16 +844,16 @@ void DeleteSelectionCommand::doApply(EditingState* editingState)
Position downstreamEnd = mostForwardCaretPosition(m_selectionToDelete.end());
bool rootWillStayOpenWithoutPlaceholder = downstreamEnd.computeContainerNode() == rootEditableElement(*downstreamEnd.computeContainerNode())
|| (downstreamEnd.computeContainerNode()->isTextNode() && downstreamEnd.computeContainerNode()->parentNode() == rootEditableElement(*downstreamEnd.computeContainerNode()));
- bool lineBreakAtEndOfSelectionToDelete = lineBreakExistsAtVisiblePosition(m_selectionToDelete.visibleEnd());
+ bool lineBreakAtEndOfSelectionToDelete = lineBreakExistsAtVisiblePosition(m_selectionToDelete.visibleEndDeprecated());
m_needPlaceholder = !rootWillStayOpenWithoutPlaceholder
- && isStartOfParagraphDeprecated(m_selectionToDelete.visibleStart(), CanCrossEditingBoundary)
- && isEndOfParagraphDeprecated(m_selectionToDelete.visibleEnd(), CanCrossEditingBoundary)
+ && isStartOfParagraphDeprecated(m_selectionToDelete.visibleStartDeprecated(), CanCrossEditingBoundary)
+ && isEndOfParagraphDeprecated(m_selectionToDelete.visibleEndDeprecated(), CanCrossEditingBoundary)
&& !lineBreakAtEndOfSelectionToDelete;
if (m_needPlaceholder) {
// Don't need a placeholder when deleting a selection that starts just
// before a table and ends inside it (we do need placeholders to hold
// open empty cells, but that's handled elsewhere).
- if (Element* table = tableElementJustAfter(m_selectionToDelete.visibleStart())) {
+ if (Element* table = tableElementJustAfter(m_selectionToDelete.visibleStartDeprecated())) {
if (m_selectionToDelete.end().anchorNode()->isDescendantOf(table))
m_needPlaceholder = false;
}

Powered by Google App Engine
This is Rietveld 408576698