Make SpellChecker::removeMarkers() to take EphemeralRange instead of VisibleSelection

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 167 matching lines @@
     // blur.
     const VisibleSelection selection = createVisibleSelection(
         SelectionInDOMTree::Builder().selectAllChildren(*element).build());
     markMisspellingsInternal(selection);
     if (!isTextField)
       parent->setAlreadySpellChecked(true);
   }
 }
 
 void SpellChecker::ignoreSpelling() {
-  removeMarkers(frame().selection().computeVisibleSelectionInDOMTree(),
+  removeMarkers(frame()
+                    .selection()
+                    .computeVisibleSelectionInDOMTree()
+                    .toNormalizedEphemeralRange(),
                 DocumentMarker::Spelling);
 }
 
 void SpellChecker::advanceToNextMisspelling(bool startBeforeSelection) {
   DocumentLifecycle::DisallowTransitionScope disallowTransition(
       frame().document()->lifecycle());
 
   // The basic approach is to search in two phases - from the selection end to
   // the end of the doc, and then we wrap and search from the doc start to
   // (approximately) where we started.
@@ skipping 111 matching lines @@
     spellCheckerClient().showSpellingUI(false);
     return;
   }
 
   advanceToNextMisspelling(true);
   spellCheckerClient().showSpellingUI(true);
 }
 
 void SpellChecker::clearMisspellingsForMovingParagraphs(
     const VisibleSelection& movingSelection) {
-  removeMarkers(movingSelection, DocumentMarker::MisspellingMarkers());
+  removeMarkers(movingSelection.toNormalizedEphemeralRange(),
+                DocumentMarker::MisspellingMarkers());
 }
 
 void SpellChecker::markMisspellingsForMovingParagraphs(
     const VisibleSelection& movingSelection) {
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // In the long term we should use idle time spell checker to prevent
@@ skipping 682 matching lines @@
 
   return false;
 }
 
 // TODO(editing-dev): No one uses this function. Remove it.
 bool SpellChecker::selectionStartHasSpellingMarkerFor(int from,
                                                       int length) const {
   return selectionStartHasMarkerFor(DocumentMarker::Spelling, from, length);
 }
 
-void SpellChecker::removeMarkers(const VisibleSelection& selection,
+void SpellChecker::removeMarkers(const EphemeralRange& range,
                                  DocumentMarker::MarkerTypes markerTypes) {
   DCHECK(!frame().document()->needsLayoutTreeUpdate());
 
-  const EphemeralRange& range = selection.toNormalizedEphemeralRange();
   if (range.isNull())
     return;
 
   frame().document()->markers().removeMarkers(range, markerTypes);
 }
 
 // TODO(xiaochengh): This function is only used by unit tests. We should move it
 // to IdleSpellCheckCallback and modify unit tests to cope with idle time spell
 // checker.
 void SpellChecker::cancelCheck() {
@@ skipping 148 matching lines @@
       if (!input.isFocusedElementInDocument())
         return false;
     }
   }
   HTMLElement* element =
       Traversal<HTMLElement>::firstAncestorOrSelf(*position.anchorNode());
   return element && element->isSpellCheckingEnabled();
 }
 
 }  // namespace blink