Prune deprecated functions from InsertTextCommand

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 83 matching lines @@
 
   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)
-    setEndingSelection(createVisibleSelectionDeprecated(
-        endingSelection().visibleEndDeprecated(),
-        endingSelection().isDirectional()));
+  if (!selectInsertedText) {
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
+    setEndingSelection(createVisibleSelection(
+        endingSelection().visibleEnd(), endingSelection().isDirectional()));
+  }
 
   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)
-    setEndingSelection(createVisibleSelectionDeprecated(
-        endingSelection().visibleEndDeprecated(),
-        endingSelection().isDirectional()));
+  if (!selectInsertedText) {
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
+    setEndingSelection(createVisibleSelection(
+        endingSelection().visibleEnd(), endingSelection().isDirectional()));
+  }
 
   return true;
 }
 
 void InsertTextCommand::doApply(EditingState* editingState) {
   DCHECK_EQ(m_text.find('\n'), kNotFound);
 
   if (!endingSelection().isNonOrphanedCaretOrRange())
     return;
 
   // Delete the current selection.
   // FIXME: This delete operation blows away the typing style.
   if (endingSelection().isRange()) {
     if (performTrivialReplace(m_text, m_selectInsertedText))
       return;
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
     bool endOfSelectionWasAtStartOfBlock =
-        isStartOfBlock(endingSelection().visibleEndDeprecated());
+        isStartOfBlock(endingSelection().visibleEnd());
     deleteSelection(editingState, false, true, false, false);
     if (editingState->isAborted())
       return;
     // deleteSelection eventually makes a new endingSelection out of a Position.
     // If that Position doesn't have a layoutObject (e.g. it is on a <frameset>
     // in the DOM), the VisibleSelection cannot be canonicalized to anything
     // other than NoSelection. The rest of this function requires a real
     // endingSelection, so bail out.
     if (endingSelection().isNone())
       return;
     if (endOfSelectionWasAtStartOfBlock) {
       if (EditingStyle* typingStyle =
               document().frame()->selection().typingStyle())
         typingStyle->removeBlockProperties();
     }
   } else if (document().frame()->editor().isOverwriteModeEnabled()) {
     if (performOverwrite(m_text, m_selectInsertedText))
       return;
   }
 
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
   Position startPosition(endingSelection().start());
 
   Position placeholder;
   // We want to remove preserved newlines and brs that will collapse (and thus
   // become unnecessary) when content is inserted just before them.
   // FIXME: We shouldn't really have to do this, but removing placeholders is a
   // workaround for 9661.
   // If the caret is just before a placeholder, downstream will normalize the
   // caret to it.
   Position downstream(mostForwardCaretPosition(startPosition));
   if (lineBreakExistsAtPosition(downstream)) {
     // FIXME: This doesn't handle placeholders at the end of anonymous blocks.
-    VisiblePosition caret = createVisiblePositionDeprecated(startPosition);
-    if (isEndOfBlock(caret) && isStartOfParagraphDeprecated(caret))
+    VisiblePosition caret = createVisiblePosition(startPosition);
+    if (isEndOfBlock(caret) && isStartOfParagraph(caret))
       placeholder = downstream;
     // Don't remove the placeholder yet, otherwise the block we're inserting
     // into would collapse before we get a chance to insert into it.  We check
     // for a placeholder now, though, because doing so requires the creation of
     // a VisiblePosition, and if we did that post-insertion it would force a
     // layout.
   }
 
   // Insert the character at the leftmost candidate.
   startPosition = mostBackwardCaretPosition(startPosition);
@@ skipping 66 matching lines @@
           document().frame()->selection().typingStyle()) {
     typingStyle->prepareToApplyAt(endPosition,
                                   EditingStyle::PreserveWritingDirection);
     if (!typingStyle->isEmpty()) {
       applyStyle(typingStyle, editingState);
       if (editingState->isAborted())
         return;
     }
   }
 
-  if (!m_selectInsertedText)
-    setEndingSelection(createVisibleSelectionDeprecated(
+  if (!m_selectInsertedText) {
+    document().updateStyleAndLayoutIgnorePendingStylesheets();
+    setEndingSelection(createVisibleSelection(
         endingSelection().end(), endingSelection().affinity(),
         endingSelection().isDirectional()));
+  }
 }
 
 Position InsertTextCommand::insertTab(const Position& pos,
                                       EditingState* editingState) {
-  Position insertPos = createVisiblePositionDeprecated(pos).deepEquivalent();
+  document().updateStyleAndLayoutIgnorePendingStylesheets();
+
+  Position insertPos = createVisiblePosition(pos).deepEquivalent();
   if (insertPos.isNull())
     return pos;
 
   Node* node = insertPos.computeContainerNode();
   unsigned offset = node->isTextNode() ? insertPos.offsetInContainerNode() : 0;
 
   // keep tabs coalesced in tab span
   if (isTabHTMLSpanElementTextNode(node)) {
     Text* textNode = toText(node);
     insertTextIntoNode(textNode, offset, "\t");
@@ skipping 21 matching lines @@
     }
   }
   if (editingState->isAborted())
     return Position();
 
   // return the position following the new tab
   return Position::lastPositionInNode(spanElement);
 }
 
 }  // namespace blink