Split general DocumentMarkerController::AddMarker() method into spelling/grammar versions

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 287 matching lines @@
     // panel, and store a marker so we draw the red squiggle later.
 
     const EphemeralRange misspelling_range = CalculateCharacterSubrange(
         EphemeralRange(spelling_search_start, spelling_search_end),
         misspelling_offset, misspelled_word.length());
     GetFrame().Selection().SetSelection(SelectionInDOMTree::Builder()
                                             .SetBaseAndExtent(misspelling_range)
                                             .Build());
     GetFrame().Selection().RevealSelection();
     GetSpellCheckerClient().UpdateSpellingUIWithMisspelledWord(misspelled_word);
-    GetFrame().GetDocument()->Markers().AddMarker(
-        misspelling_range.StartPosition(), misspelling_range.EndPosition(),
-        DocumentMarker::kSpelling);
+    GetFrame().GetDocument()->Markers().AddSpellingMarker(
+        misspelling_range.StartPosition(), misspelling_range.EndPosition());
   }
 }
 
 void SpellChecker::ShowSpellingGuessPanel() {
   if (GetSpellCheckerClient().SpellingUIIsShowing()) {
     GetSpellCheckerClient().ShowSpellingUI(false);
     return;
   }
 
   AdvanceToNextMisspelling(true);
@@ skipping 211 matching lines @@
     }
   }
 }
 
 static void AddMarker(Document* document,
                       const EphemeralRange& checking_range,
                       DocumentMarker::MarkerType type,
                       int location,
                       int length,
                       const String& description) {
+  DCHECK(type == DocumentMarker::kSpelling || type == DocumentMarker::kGrammar);

[yosin_UTC9, 2017/05/23 09:35:04]

nit: s/);/) << type;/

   DCHECK_GT(length, 0);
   DCHECK_GE(location, 0);
   const EphemeralRange& range_to_mark =
       CalculateCharacterSubrange(checking_range, location, length);
   if (!SpellChecker::IsSpellCheckingEnabledAt(range_to_mark.StartPosition()))
     return;
   if (!SpellChecker::IsSpellCheckingEnabledAt(range_to_mark.EndPosition()))
     return;
-  document->Markers().AddMarker(range_to_mark.StartPosition(),
-                                range_to_mark.EndPosition(), type, description);
+
+  if (type == DocumentMarker::kSpelling) {
+    document->Markers().AddSpellingMarker(range_to_mark.StartPosition(),
+                                          range_to_mark.EndPosition(),
+                                          description);

[yosin_UTC9, 2017/05/23 09:35:04]

Please add |return| for early-return style.

+  } else {
+    document->Markers().AddGrammarMarker(range_to_mark.StartPosition(),

[yosin_UTC9, 2017/05/23 09:35:04]

Please add DCHECK_EQ(type, DM::kGrammar);

+                                         range_to_mark.EndPosition(),
+                                         description);
+  }
 }
 
 void SpellChecker::MarkAndReplaceFor(
     SpellCheckRequest* request,
     const Vector<TextCheckingResult>& results) {
   TRACE_EVENT0("blink", "SpellChecker::markAndReplaceFor");
   DCHECK(request);
   if (!GetFrame().Selection().IsAvailable()) {
     // "editing/spelling/spellcheck-async-remove-frame.html" reaches here.
     return;
@@ skipping 658 matching lines @@
       if (!input.IsFocusedElementInDocument())
         return false;
     }
   }
   HTMLElement* element =
       Traversal<HTMLElement>::FirstAncestorOrSelf(*position.AnchorNode());
   return element && element->IsSpellCheckingEnabled();
 }
 
 }  // namespace blink