Mark calls of visible{Start,End} with dirty layout deprecated

third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009, 2010, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 939 matching lines @@
         destination = VisiblePosition::beforeNode(placeholder);
     }
 
     moveParagraph(startOfParagraphToMove, endOfParagraphDeprecated(startOfParagraphToMove), destination, editingState);
     if (editingState->isAborted())
         return;
 
     // 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())
             m_endOfInsertedContent = m_startOfInsertedContent;
     }
 }
 
 static Node* enclosingInline(Node* node)
 {
     while (ContainerNode* parent = node->parentNode()) {
@@ skipping 66 matching lines @@
     // We can skip matching the style if the selection is plain text.
     if ((selection.start().anchorNode()->layoutObject() && selection.start().anchorNode()->layoutObject()->style()->userModify() == READ_WRITE_PLAINTEXT_ONLY)
         && (selection.end().anchorNode()->layoutObject() && selection.end().anchorNode()->layoutObject()->style()->userModify() == READ_WRITE_PLAINTEXT_ONLY))
         m_matchStyle = false;
 
     if (m_matchStyle) {
         m_insertionStyle = EditingStyle::create(selection.start());
         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);
 
     Element* enclosingBlockOfVisibleStart = enclosingBlock(visibleStart.deepEquivalent().anchorNode());
 
     const bool startIsInsideMailBlockquote = enclosingNodeOfType(selection.start(), isMailHTMLBlockquoteElement, CanCrossEditingBoundary);
     const bool selectionIsPlainText = !selection.isContentRichlyEditable();
     Element* currentRoot = selection.rootEditableElement();
 
@@ skipping 11 matching lines @@
         // will leave hanging block(s).
         // Merge blocks if the start of the selection was in a Mail blockquote, since we handle
         // that case specially to prevent nesting.
         bool mergeBlocksAfterDelete = startIsInsideMailBlockquote || isEndOfParagraphDeprecated(visibleEnd) || isStartOfBlock(visibleStart);
         // FIXME: We should only expand to include fully selected special elements if we are copying a
         // selection and pasting it on top of itself.
         deleteSelection(editingState, false, mergeBlocksAfterDelete, false);
         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
                 insertParagraphSeparator(editingState);
             if (editingState->isAborted())
                 return;
         }
     } else {
         DCHECK(selection.isCaret());
         if (fragment.hasInterchangeNewlineAtStart()) {
             const VisiblePosition next = nextPositionOf(visibleStart, CannotCrossEditingBoundary);
             if (isEndOfParagraphDeprecated(visibleStart) && !isStartOfParagraphDeprecated(visibleStart) && next.isNotNull())
                 setEndingSelection(next);
             else
                 insertParagraphSeparator(editingState);
             if (editingState->isAborted())
                 return;
         }
         // We split the current paragraph in two to avoid nesting the blocks from the fragment inside the current block.
         // For example paste <div>foo</div><div>bar</div><div>baz</div> into <div>x^x</div>, where ^ is the caret.
         // 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()));
         }
     }
 
     Position insertionPos = endingSelection().start();
     // We don't want any of the pasted content to end up nested in a Mail blockquote, so first break
     // out of any surrounding Mail blockquotes. Unless we're inserting in a table, in which case
     // breaking the blockquote will prevent the content from actually being inserted in the table.
     if (enclosingNodeOfType(insertionPos, isMailHTMLBlockquoteElement, CanCrossEditingBoundary) && m_preventNesting && !(enclosingNodeOfType(insertionPos, &isTableStructureNode))) {
         applyCommandToComposite(BreakBlockquoteCommand::create(document()), editingState);
         if (editingState->isAborted())
@@ skipping 234 matching lines @@
             // Mutation events (bug 22634) triggered by inserting the <br> might have removed the content we're about to move
             if (!startOfParagraphToMove.deepEquivalent().isConnected())
                 return;
         }
 
         // FIXME: Maintain positions for the start and end of inserted content instead of keeping nodes.  The nodes are
         // only ever used to create positions where inserted content starts/ends.
         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;
     if (fragment.hasInterchangeNewlineAtEnd()) {
         VisiblePosition endOfInsertedContent = positionAtEndOfInsertedContent();
         VisiblePosition next = nextPositionOf(endOfInsertedContent, CannotCrossEditingBoundary);
 
         if (selectionEndWasEndOfParagraph || !isEndOfParagraphDeprecated(endOfInsertedContent) || next.isNull()) {
             if (HTMLTextFormControlElement* textControl = enclosingTextFormControl(currentRoot)) {
                 if (!insertedNodes.lastLeafInserted()->nextSibling()) {
                     insertNodeAfter(textControl->createPlaceholderBreakElement(), insertedNodes.lastLeafInserted(), editingState);
                     if (editingState->isAborted())
                         return;
                 }
                 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());
                 if (isListItem(enclosingBlockElement)) {
                     HTMLLIElement* newListItem = HTMLLIElement::create(document());
                     insertNodeAfter(newListItem, enclosingBlockElement, editingState);
                     if (editingState->isAborted())
                         return;
                     setEndingSelection(VisiblePosition::firstPositionInNode(newListItem));
                 } else {
                     // Use a default paragraph element (a plain div) for the empty paragraph, using the last paragraph
                     // block's style seems to annoy users.
                     insertParagraphSeparator(editingState, true, !startIsInsideMailBlockquote && highestEnclosingNodeOfType(endOfInsertedContent.deepEquivalent(),
                         isMailHTMLBlockquoteElement, CannotCrossEditingBoundary, insertedNodes.firstNodeInserted()->parentNode()));
                     if (editingState->isAborted())
                         return;
                 }
 
                 // Select up to the paragraph separator that was added.
-                lastPositionToSelect = endingSelection().visibleStart().deepEquivalent();
+                lastPositionToSelect = endingSelection().visibleStartDeprecated().deepEquivalent();
                 updateNodesInserted(lastPositionToSelect.anchorNode());
             }
         } else {
             // Select up to the beginning of the next paragraph.
             lastPositionToSelect = mostForwardCaretPosition(next.deepEquivalent());
         }
     } else {
         mergeEndIfNeeded(editingState);
         if (editingState->isAborted())
             return;
@@ skipping 346 matching lines @@
     visitor->trace(m_startOfInsertedContent);
     visitor->trace(m_endOfInsertedContent);
     visitor->trace(m_insertionStyle);
     visitor->trace(m_documentFragment);
     visitor->trace(m_startOfInsertedRange);
     visitor->trace(m_endOfInsertedRange);
     CompositeEditCommand::trace(visitor);
 }
 
 } // namespace blink