Utilize EditCommand::setEndingSelection() taking SelectionInDOMTree

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

 /*
  * Copyright (C) 2005, 2006, 2007, 2008 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 279 matching lines @@
   m_commands.append(command);
 }
 
 void CompositeEditCommand::applyCommandToComposite(
     CompositeEditCommand* command,
     const VisibleSelection& selection,
     EditingState* editingState) {
   command->setParent(this);
   if (selection != command->endingSelection()) {
     command->setStartingSelection(selection);
-    command->setEndingSelection(selection);
+    command->setEndingVisibleSelection(selection);
   }
   command->doApply(editingState);
   if (!editingState->isAborted())
     m_commands.append(command);
 }
 
 void CompositeEditCommand::appendCommandToComposite(
     CompositeEditCommand* command) {
   ensureComposition()->append(command->ensureComposition());
   command->m_composition = nullptr;
@@ skipping 924 matching lines @@
   return newBlock;
 }
 
 void CompositeEditCommand::pushAnchorElementDown(Element* anchorNode,
                                                  EditingState* editingState) {
   if (!anchorNode)
     return;
 
   DCHECK(anchorNode->isLink()) << anchorNode;
 
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder().selectAllChildren(*anchorNode).build()));
+  setEndingSelection(
+      SelectionInDOMTree::Builder().selectAllChildren(*anchorNode).build());
   applyStyledElement(anchorNode, editingState);
   if (editingState->isAborted())
     return;
   // Clones of anchorNode have been pushed down, now remove it.
   if (anchorNode->isConnected())
     removeNodePreservingChildren(anchorNode, editingState);
 }
 
 // Clone the paragraph between start and end under blockElement,
 // preserving the hierarchy up to outerNode.
@@ skipping 173 matching lines @@
       startOfParagraphToMove.deepEquivalent() ==
               endOfParagraphToMove.deepEquivalent()
           ? start
           : mostBackwardCaretPosition(endOfParagraphToMove.deepEquivalent());
   if (comparePositions(start, end) > 0)
     end = start;
 
   cloneParagraphUnderNewElement(start, end, outerNode, blockElement,
                                 editingState);
 
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder().collapse(start).extend(end).build()));
+  setEndingSelection(
+      SelectionInDOMTree::Builder().collapse(start).extend(end).build());
   deleteSelection(editingState, false, false, false);
   if (editingState->isAborted())
     return;
 
   // There are bugs in deletion when it removes a fully selected table/list.
   // It expands and removes the entire table/list, but will let content
   // before and after the table/list collapse onto one line.
 
   cleanupAfterDeletion(editingState);
   if (editingState->isAborted())
@@ skipping 138 matching lines @@
     styleInEmptyParagraph->mergeTypingStyle(&document());
     // The moved paragraph should assume the block style of the destination.
     styleInEmptyParagraph->removeBlockProperties();
   }
 
   // FIXME (5098931): We should add a new insert action
   // "WebViewInsertActionMoved" and call shouldInsertFragment here.
 
   DCHECK(!document().needsLayoutTreeUpdate());
 
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder().collapse(start).extend(end).build()));
+  setEndingSelection(
+      SelectionInDOMTree::Builder().collapse(start).extend(end).build());
   document()
       .frame()
       ->spellChecker()
       .clearMisspellingsAndBadGrammarForMovingParagraphs(endingSelection());
   deleteSelection(editingState, false, false, false);
   if (editingState->isAborted())
     return;
 
   DCHECK(destination.deepEquivalent().isConnected()) << destination;
   cleanupAfterDeletion(editingState, destination);
@@ skipping 27 matching lines @@
       return;
   }
 
   // TextIterator::rangeLength requires clean layout.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   destinationIndex = TextIterator::rangeLength(
       Position::firstPositionInNode(document().documentElement()),
       destination.toParentAnchoredPosition(), true);
 
-  VisibleSelection destinationSelection =
-      createVisibleSelection(SelectionInDOMTree::Builder()
-                                 .collapse(destination.toPositionWithAffinity())
-                                 .setIsDirectional(originalIsDirectional)
-                                 .build());
+  const SelectionInDOMTree& destinationSelection =
+      SelectionInDOMTree::Builder()
+          .collapse(destination.toPositionWithAffinity())
+          .setIsDirectional(originalIsDirectional)
+          .build();
   if (endingSelection().isNone()) {
     // We abort executing command since |destination| becomes invisible.
     editingState->abort();
     return;
   }
   setEndingSelection(destinationSelection);
   ReplaceSelectionCommand::CommandOptions options =
       ReplaceSelectionCommand::SelectReplacement |
       ReplaceSelectionCommand::MovingParagraph;
   if (shouldPreserveStyle == DoNotPreserveStyle)
@@ skipping 38 matching lines @@
   // to rangeFromLocationAndLength with a location past the end of the
   // document (which will return null).
   EphemeralRange startRange = PlainTextRange(destinationIndex + startIndex)
                                   .createRangeForSelection(*documentElement);
   if (startRange.isNull())
     return;
   EphemeralRange endRange = PlainTextRange(destinationIndex + endIndex)
                                 .createRangeForSelection(*documentElement);
   if (endRange.isNull())
     return;
-  setEndingSelection(
-      createVisibleSelection(SelectionInDOMTree::Builder()
-                                 .collapse(startRange.startPosition())
-                                 .extend(endRange.startPosition())
-                                 .setIsDirectional(originalIsDirectional)
-                                 .build()));
+  setEndingSelection(SelectionInDOMTree::Builder()
+                         .collapse(startRange.startPosition())
+                         .extend(endRange.startPosition())
+                         .setIsDirectional(originalIsDirectional)
+                         .build());
 }
 
 // FIXME: Send an appropriate shouldDeleteRange call.
 bool CompositeEditCommand::breakOutOfEmptyListItem(EditingState* editingState) {
   DCHECK(!document().needsLayoutTreeUpdate());
   Node* emptyListItem =
       enclosingEmptyListItem(endingSelection().visibleStart());
   if (!emptyListItem)
     return false;
 
@@ skipping 80 matching lines @@
             : listNode,
         editingState);
     if (editingState->isAborted())
       return false;
   }
 
   appendBlockPlaceholder(newBlock, editingState);
   if (editingState->isAborted())
     return false;
 
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder()
-          .collapse(Position::firstPositionInNode(newBlock))
-          .setIsDirectional(endingSelection().isDirectional())
-          .build()));
+  setEndingSelection(SelectionInDOMTree::Builder()
+                         .collapse(Position::firstPositionInNode(newBlock))
+                         .setIsDirectional(endingSelection().isDirectional())
+                         .build());
 
   style->prepareToApplyAt(endingSelection().start());
   if (!style->isEmpty()) {
     applyStyle(style, editingState);
     if (editingState->isAborted())
       return false;
   }
 
   return true;
 }
@@ skipping 38 matching lines @@
   VisiblePosition atBR = VisiblePosition::beforeNode(br);
   // If the br we inserted collapsed, for example:
   //   foo<br><blockquote>...</blockquote>
   // insert a second one.
   if (!isStartOfParagraph(atBR)) {
     insertNodeBefore(HTMLBRElement::create(document()), br, editingState);
     if (editingState->isAborted())
       return false;
     document().updateStyleAndLayoutIgnorePendingStylesheets();
   }
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder()
-          .collapse(atBR.toPositionWithAffinity())
-          .setIsDirectional(endingSelection().isDirectional())
-          .build()));
+  setEndingSelection(SelectionInDOMTree::Builder()
+                         .collapse(atBR.toPositionWithAffinity())
+                         .setIsDirectional(endingSelection().isDirectional())
+                         .build());
 
   // If this is an empty paragraph there must be a line break here.
   if (!lineBreakExistsAtVisiblePosition(caret))
     return false;
 
   Position caretPos(mostForwardCaretPosition(caret.deepEquivalent()));
   // A line break is either a br or a preserved newline.
   DCHECK(isHTMLBRElement(caretPos.anchorNode()) ||
          (caretPos.anchorNode()->isTextNode() &&
           caretPos.anchorNode()->layoutObject()->style()->preserveNewline()))
@@ skipping 133 matching lines @@
   return node;
 }
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->trace(m_commands);
   visitor->trace(m_composition);
   EditCommand::trace(visitor);
 }
 
 }  // namespace blink