Get rid of EditCommand::setEndingSelection() taking one VisiblePosition

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 1189 matching lines @@
     // 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()) {
       document().updateStyleAndLayoutIgnorePendingStylesheets();
       VisiblePosition startAfterDelete = endingSelection().visibleStart();
       if (isEndOfParagraph(startAfterDelete) &&
           !isStartOfParagraph(startAfterDelete) &&
-          !isEndOfEditableOrNonEditableContent(startAfterDelete))
-        setEndingSelection(nextPositionOf(startAfterDelete));
-      else
+          !isEndOfEditableOrNonEditableContent(startAfterDelete)) {
+        setEndingSelection(
+            SelectionInDOMTree::Builder()
+                .collapse(nextPositionOf(startAfterDelete).deepEquivalent())
+                .build());
+      } else {
         insertParagraphSeparator(editingState);
+      }
       if (editingState->isAborted())
         return;
     }
   } else {
     DCHECK(selection.isCaret());
     if (fragment.hasInterchangeNewlineAtStart()) {
       const VisiblePosition next =
           nextPositionOf(visibleStart, CannotCrossEditingBoundary);
       if (isEndOfParagraph(visibleStart) && !isStartOfParagraph(visibleStart) &&
           next.isNotNull()) {
-        setEndingSelection(next);
+        setEndingSelection(SelectionInDOMTree::Builder()
+                               .collapse(next.deepEquivalent())
+                               .build());
       } else {
         insertParagraphSeparator(editingState);
         if (editingState->isAborted())
           return;
         document().updateStyleAndLayoutIgnorePendingStylesheets();
       }
     }
     // 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 &&
         !isEndOfParagraph(endingSelection().visibleStart()) &&
         !isStartOfParagraph(endingSelection().visibleStart())) {
       insertParagraphSeparator(editingState);
       if (editingState->isAborted())
         return;
-      document().updateStyleAndLayoutIgnorePendingStylesheets();

[Xiaocheng, 2016/10/26 07:33:23]

previousPositionOf(VP) also requires clean layout.

[yosin_UTC9, 2016/10/26 07:41:02]

Done. 
I have it in PS#1, then I removed in PS#2. (T_T)

-      setEndingSelection(previousPositionOf(endingSelection().visibleStart()));
+      setEndingSelection(
+          SelectionInDOMTree::Builder()
+              .collapse(previousPositionOf(endingSelection().visibleStart())
+                            .deepEquivalent())
+              .build());
     }
   }
 
   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) &&
@@ skipping 356 matching lines @@
     if (selectionEndWasEndOfParagraph ||
         !isEndOfParagraph(endOfInsertedContent) || next.isNull()) {
       if (HTMLTextFormControlElement* textControl =
               enclosingTextFormControl(currentRoot)) {
         if (!insertedNodes.lastLeafInserted()->nextSibling()) {
           insertNodeAfter(textControl->createPlaceholderBreakElement(),
                           insertedNodes.lastLeafInserted(), editingState);
           if (editingState->isAborted())
             return;
         }
-        document().updateStyleAndLayoutIgnorePendingStylesheets();
         setEndingSelection(
-            VisiblePosition::afterNode(insertedNodes.lastLeafInserted()));
+            SelectionInDOMTree::Builder()
+                .collapse(Position::afterNode(insertedNodes.lastLeafInserted()))
+                .build());
         // Select up to the paragraph separator that was added.
         lastPositionToSelect =
             endingSelection().visibleStart().deepEquivalent();
       } else if (!isStartOfParagraph(endOfInsertedContent)) {
-        setEndingSelection(endOfInsertedContent);
+        setEndingSelection(SelectionInDOMTree::Builder()
+                               .collapse(endOfInsertedContent.deepEquivalent())
+                               .build());
         Element* enclosingBlockElement =
             enclosingBlock(endOfInsertedContent.deepEquivalent().anchorNode());
         if (isListItem(enclosingBlockElement)) {
           HTMLLIElement* newListItem = HTMLLIElement::create(document());
           insertNodeAfter(newListItem, enclosingBlockElement, editingState);
           if (editingState->isAborted())
             return;
-          document().updateStyleAndLayoutIgnorePendingStylesheets();
-          setEndingSelection(VisiblePosition::firstPositionInNode(newListItem));
+          setEndingSelection(
+              SelectionInDOMTree::Builder()
+                  .collapse(Position::firstPositionInNode(newListItem))
+                  .build());
         } 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,
@@ skipping 445 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