Utilize EditCommand::setEndingSelection() taking SelectionInDOMTree

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

 /*
  * Copyright (C) 2005 Apple Computer, 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 61 matching lines @@
 
   return pos;
 }
 
 void InsertTextCommand::setEndingSelectionWithoutValidation(
     const Position& startPosition,
     const Position& endPosition) {
   // We could have inserted a part of composed character sequence,
   // so we are basically treating ending selection as a range to avoid
   // validation. <http://bugs.webkit.org/show_bug.cgi?id=15781>
-  VisibleSelection forcedEndingSelection;
-  forcedEndingSelection.setWithoutValidation(startPosition, endPosition);
-  forcedEndingSelection.setIsDirectional(endingSelection().isDirectional());
-  setEndingSelection(forcedEndingSelection);
+  setEndingSelection(SelectionInDOMTree::Builder()
+                         .collapse(startPosition)
+                         .extend(endPosition)
+                         .setIsDirectional(endingSelection().isDirectional())
+                         .build());
 }
 
 // This avoids the expense of a full fledged delete operation, and avoids a
 // layout that typically results from text removal.
 bool InsertTextCommand::performTrivialReplace(const String& text,
                                               bool selectInsertedText) {
   if (!endingSelection().isRange())
     return false;
 
   if (text.contains('\t') || text.contains(' ') || text.contains('\n'))
     return false;
 
   Position start = endingSelection().start();
   Position endPosition = replaceSelectedTextInNode(text);
   if (endPosition.isNull())
     return false;
 
   setEndingSelectionWithoutValidation(start, endPosition);
   if (selectInsertedText)
     return true;
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder()
-          .collapse(endingSelection().end())
-          .setIsDirectional(endingSelection().isDirectional())
-          .build()));
+  setEndingSelection(SelectionInDOMTree::Builder()
+                         .collapse(endingSelection().end())
+                         .setIsDirectional(endingSelection().isDirectional())
+                         .build());
   return true;
 }
 
 bool InsertTextCommand::performOverwrite(const String& text,
                                          bool selectInsertedText) {
   Position start = endingSelection().start();
   if (start.isNull() || !start.isOffsetInAnchor() ||
       !start.computeContainerNode()->isTextNode())
     return false;
   Text* textNode = toText(start.computeContainerNode());
   if (!textNode)
     return false;
 
   unsigned count = std::min(text.length(),
                             textNode->length() - start.offsetInContainerNode());
   if (!count)
     return false;
 
   replaceTextInNode(textNode, start.offsetInContainerNode(), count, text);
 
   Position endPosition =
       Position(textNode, start.offsetInContainerNode() + text.length());
   setEndingSelectionWithoutValidation(start, endPosition);
-  if (selectInsertedText)
+  if (selectInsertedText || endingSelection().isNone())
     return true;
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-  if (endingSelection().isNone())
-    return true;
-  setEndingSelection(createVisibleSelection(
-      SelectionInDOMTree::Builder()
-          .collapse(endingSelection().end())
-          .setIsDirectional(endingSelection().isDirectional())
-          .build()));
+  setEndingSelection(SelectionInDOMTree::Builder()
+                         .collapse(endingSelection().end())
+                         .setIsDirectional(endingSelection().isDirectional())
+                         .build());
   return true;
 }
 
 void InsertTextCommand::doApply(EditingState* editingState) {
   DCHECK_EQ(m_text.find('\n'), kNotFound);
 
   if (!endingSelection().isNonOrphanedCaretOrRange())
     return;
 
   // Delete the current selection.
@@ skipping 120 matching lines @@
     typingStyle->prepareToApplyAt(endPosition,
                                   EditingStyle::PreserveWritingDirection);
     if (!typingStyle->isEmpty()) {
       applyStyle(typingStyle, editingState);
       if (editingState->isAborted())
         return;
     }
   }
 
   if (!m_selectInsertedText) {
-    document().updateStyleAndLayoutIgnorePendingStylesheets();
     SelectionInDOMTree::Builder builder;
     builder.setAffinity(endingSelection().affinity());
     builder.setIsDirectional(endingSelection().isDirectional());
     if (endingSelection().end().isNotNull())
       builder.collapse(endingSelection().end());
-    setEndingSelection(createVisibleSelection(builder.build()));
+    setEndingSelection(builder.build());
   }
 }
 
 Position InsertTextCommand::insertTab(const Position& pos,
                                       EditingState* editingState) {
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   Position insertPos = createVisiblePosition(pos).deepEquivalent();
   if (insertPos.isNull())
     return pos;
@@ skipping 29 matching lines @@
     }
   }
   if (editingState->isAborted())
     return Position();
 
   // return the position following the new tab
   return Position::lastPositionInNode(spanElement);
 }
 
 }  // namespace blink