Refactor DocumentMarkerController

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 965 matching lines @@
     m_idleSpellCheckCallback->setNeedsInvocation();
 }
 
 void SpellChecker::removeSpellingMarkers() {
   frame().document()->markers().removeMarkers(
       DocumentMarker::MisspellingMarkers());
 }
 
 void SpellChecker::removeSpellingMarkersUnderWords(
     const Vector<String>& words) {
-  MarkerRemoverPredicate removerPredicate(words);
-
   DocumentMarkerController& markerController = frame().document()->markers();
-  markerController.removeMarkers(removerPredicate);
+  markerController.removeSpellingMarkersForWords(words);
   markerController.repaintMarkers();
 }
 
 void SpellChecker::spellCheckAfterBlur() {
   if (RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     return;
 
   if (!frame()
            .selection()
            .computeVisibleSelectionInDOMTreeDeprecated()
@@ skipping 237 matching lines @@
         startOfNextParagraph(createVisiblePosition(paragraphEnd));
     paragraphStart = newParagraphStart.toParentAnchoredPosition();
     paragraphEnd = endOfParagraph(newParagraphStart).toParentAnchoredPosition();
     firstIteration = false;
     totalLengthProcessed += currentLength;
   }
   return std::make_pair(firstFoundItem, firstFoundOffset);
 }
 
 }  // namespace blink