[WIP] Clean up DocumentMarkerController API

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 284 matching lines @@
     // 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(SelectionInDOMTree::Builder()
                                          .setBaseAndExtent(misspellingRange)
                                          .build());
     frame().selection().revealSelection();
     spellCheckerClient().updateSpellingUIWithMisspelledWord(misspelledWord);
-    frame().document()->markers().addMarker(misspellingRange.startPosition(),
-                                            misspellingRange.endPosition(),
-                                            DocumentMarker::Spelling);
+    frame().document()->markers().addSpellingMarker(
+        misspellingRange.startPosition(), misspellingRange.endPosition());
   }
 }
 
 void SpellChecker::showSpellingGuessPanel() {
   if (spellCheckerClient().spellingUIIsShowing()) {
     spellCheckerClient().showSpellingUI(false);
     return;
   }
 
   advanceToNextMisspelling(true);
@@ skipping 223 matching lines @@
                       int length,
                       const String& description) {
   DCHECK_GT(length, 0);
   DCHECK_GE(location, 0);
   const EphemeralRange& rangeToMark =
       calculateCharacterSubrange(checkingRange, location, length);
   if (!SpellChecker::isSpellCheckingEnabledAt(rangeToMark.startPosition()))
     return;
   if (!SpellChecker::isSpellCheckingEnabledAt(rangeToMark.endPosition()))
     return;
-  document->markers().addMarker(rangeToMark.startPosition(),
-                                rangeToMark.endPosition(), type, description);
+
+  DCHECK(type == DocumentMarker::Grammar || type == DocumentMarker::Spelling);
+  if (type == DocumentMarker::Grammar) {
+    document->markers().addGrammarMarker(
+        rangeToMark.startPosition(), rangeToMark.endPosition(), description);
+  } else {
+    document->markers().addSpellingMarker(
+        rangeToMark.startPosition(), rangeToMark.endPosition(), description);
+  }
 }
 
 void SpellChecker::markAndReplaceFor(
     SpellCheckRequest* request,
     const Vector<TextCheckingResult>& results) {
   TRACE_EVENT0("blink", "SpellChecker::markAndReplaceFor");
   DCHECK(request);
   if (!frame().selection().isAvailable()) {
     // "editing/spelling/spellcheck-async-remove-frame.html" reaches here.
     return;
@@ skipping 347 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;
 
   // TODO(yosin): We should hoist updateStyleAndLayoutIgnorePendingStylesheets
   // to caller. See http://crbug.com/590369 for more details.
   // TODO(xiaochengh): In the long term we should use idle time spell checker to
@@ skipping 249 matching lines @@
       if (!input.isFocusedElementInDocument())
         return false;
     }
   }
   HTMLElement* element =
       Traversal<HTMLElement>::firstAncestorOrSelf(*position.anchorNode());
   return element && element->isSpellCheckingEnabled();
 }
 
 }  // namespace blink