Revert of Prune CreateVisibleSelectionDeprecated from SpellChecker

third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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 280 matching lines @@
         // going until the end of the very first chunk we tested is far enough
         spellingSearchEnd = Position::editingPositionOf(searchEndNodeAfterWrap, searchEndOffsetAfterWrap);
         misspelledItem = findFirstMisspelling(spellingSearchStart, spellingSearchEnd);
     }
 
     if (!misspelledWord.isEmpty()) {
         // We found a misspelling. Select the misspelling, update the spelling panel, and store
         // a marker so we draw the red squiggle later.
 
         const EphemeralRange misspellingRange = calculateCharacterSubrange(EphemeralRange(spellingSearchStart, spellingSearchEnd), misspellingOffset, misspelledWord.length());
-        frame().selection().setSelection(createVisibleSelection(misspellingRange));
+        frame().selection().setSelection(createVisibleSelectionDeprecated(misspellingRange));
         frame().selection().revealSelection();
         spellCheckerClient().updateSpellingUIWithMisspelledWord(misspelledWord);
         frame().document()->markers().addMarker(misspellingRange.startPosition(), misspellingRange.endPosition(), DocumentMarker::Spelling);
     }
 }
 
 void SpellChecker::showSpellingGuessPanel()
 {
     if (spellCheckerClient().spellingUIIsShowing()) {
         spellCheckerClient().showSpellingUI(false);
@@ skipping 75 matching lines @@
     // Since the word containing the current selection is never marked, this does a check to
     // see if typing made a new word that is not in the current selection. Basically, you
     // get this by being at the end of a word and typing a space.
     VisiblePosition start = createVisiblePosition(cmd.endingSelection().start(), cmd.endingSelection().affinity());
     VisiblePosition previous = previousPositionOf(start);
 
     VisiblePosition wordStartOfPrevious = startOfWord(previous, LeftWordIfOnBoundary);
 
     if (cmd.commandTypeOfOpenCommand() == TypingCommand::InsertParagraphSeparator) {
         VisiblePosition nextWord = nextWordPosition(start);
-        VisibleSelection words = createVisibleSelection(wordStartOfPrevious, endOfWord(nextWord));
+        VisibleSelection words = createVisibleSelectionDeprecated(wordStartOfPrevious, endOfWord(nextWord));
         markMisspellingsAfterLineBreak(words);
         return;
     }
 
     if (previous.isNull())
         return;
     VisiblePosition currentWordStart = startOfWord(start, LeftWordIfOnBoundary);
     if (wordStartOfPrevious.deepEquivalent() == currentWordStart.deepEquivalent())
         return;
     markMisspellingsAfterTypingToWord(wordStartOfPrevious);
 }
 
 void SpellChecker::markMisspellingsAfterLineBreak(const VisibleSelection& wordSelection)
 {
     TRACE_EVENT0("blink", "SpellChecker::markMisspellingsAfterLineBreak");
 
     markMisspellingsAndBadGrammar(wordSelection);
 }
 
 void SpellChecker::markMisspellingsAfterTypingToWord(const VisiblePosition &wordStart)
 {
     TRACE_EVENT0("blink", "SpellChecker::markMisspellingsAfterTypingToWord");
 
-    VisibleSelection adjacentWords = createVisibleSelection(startOfWord(wordStart, LeftWordIfOnBoundary), endOfWord(wordStart, RightWordIfOnBoundary));
+    VisibleSelection adjacentWords = createVisibleSelectionDeprecated(startOfWord(wordStart, LeftWordIfOnBoundary), endOfWord(wordStart, RightWordIfOnBoundary));
     markMisspellingsAndBadGrammar(adjacentWords);
 }
 
 bool SpellChecker::isSpellCheckingEnabledInFocusedNode() const
 {
     Node* focusedNode = frame().selection().start().anchorNode();
     if (!focusedNode)
         return false;
     const Element* focusedElement = focusedNode->isElementNode() ? toElement(focusedNode) : focusedNode->parentElement();
     if (!focusedElement)
@@ skipping 259 matching lines @@
 {
     EphemeralRange caretRange = frame().selection().selection().toNormalizedEphemeralRange();
     if (caretRange.isNull())
         return;
     DocumentMarkerVector markers = frame().document()->markers().markersInRange(caretRange, DocumentMarker::MisspellingMarkers());
     if (markers.size() < 1 || markers[0]->startOffset() >= markers[0]->endOffset())
         return;
     EphemeralRange markerRange = EphemeralRange(Position(caretRange.startPosition().computeContainerNode(), markers[0]->startOffset()), Position(caretRange.endPosition().computeContainerNode(), markers[0]->endOffset()));
     if (markerRange.isNull())
         return;
-    frame().selection().setSelection(createVisibleSelection(markerRange), CharacterGranularity);
+    frame().selection().setSelection(createVisibleSelectionDeprecated(markerRange), CharacterGranularity);
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
     frame().editor().replaceSelectionWithText(text, false, false);
 }
 
 static bool shouldCheckOldSelection(const VisibleSelection& oldSelection)
 {
@@ skipping 41 matching lines @@
 
     VisibleSelection newAdjacentWords;
     const VisibleSelection newSelection = frame().selection().selection();
     if (isSelectionInTextFormControl(newSelection)) {
         const Position newStart = newSelection.start();
         newAdjacentWords.setWithoutValidation(HTMLTextFormControlElement::startOfWord(newStart), HTMLTextFormControlElement::endOfWord(newStart));
     } else {
         const bool caretBrowsing = frame().settings() && frame().settings()->caretBrowsingEnabled();
         if (newSelection.isContentEditable() || caretBrowsing) {
             const VisiblePosition newStart(newSelection.visibleStart());
-            newAdjacentWords = createVisibleSelection(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
+            newAdjacentWords = createVisibleSelectionDeprecated(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
         }
     }
 
     // When typing we check spelling elsewhere, so don't redo it here.
     // If this is a change in selection resulting from a delete operation,
     // oldSelection may no longer be in the document.
     // FIXME(http://crbug.com/382809): if oldSelection is on a textarea
     // element, we cause synchronous layout.
     spellCheckOldSelection(oldSelection, newAdjacentWords);
 }
@@ skipping 35 matching lines @@
 }
 
 void SpellChecker::spellCheckOldSelection(const VisibleSelection& oldSelection, const VisibleSelection& newAdjacentWords)
 {
     if (!isSpellCheckingEnabled())
         return;
 
     TRACE_EVENT0("blink", "SpellChecker::spellCheckOldSelection");
 
     VisiblePosition oldStart(oldSelection.visibleStart());
-    VisibleSelection oldAdjacentWords = createVisibleSelection(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary));
+    VisibleSelection oldAdjacentWords = createVisibleSelectionDeprecated(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary));
     if (oldAdjacentWords == newAdjacentWords)
         return;
     markMisspellingsAndBadGrammar(oldAdjacentWords);
 }
 
 static Node* findFirstMarkable(Node* node)
 {
     while (node) {
         if (!node->layoutObject())
             return 0;
@@ skipping 170 matching lines @@
         VisiblePosition newParagraphStart = startOfNextParagraph(createVisiblePosition(paragraphEnd));
         paragraphStart = newParagraphStart.toParentAnchoredPosition();
         paragraphEnd = endOfParagraph(newParagraphStart).toParentAnchoredPosition();
         firstIteration = false;
         totalLengthProcessed += currentLength;
     }
     return std::make_pair(firstFoundItem, firstFoundOffset);
 }
 
 } // namespace blink