[WIP] Add DocumentMarkerController::addGrammarMarker() and addSpellingMarker()

third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
@@ skipping 42 matching lines @@
   setContext(&document);
 }
 
 void DocumentMarkerController::clear() {
   m_spelling.clear();
   m_grammar.clear();
   m_textMatches.clear();
   m_compositions.clear();
 }
 
-void DocumentMarkerController::addMarker(const Position& start,
-                                         const Position& end,
-                                         DocumentMarker::MarkerType type,
-                                         const String& description) {
+void DocumentMarkerController::addCompositionMarker(const Position& start,

[yosin_UTC9, 2017/03/22 05:23:46]

Please move addCompositionMarker() changes to another CL.
This CL changes spelling and grammer markers.

[rlanday, 2017/03/22 17:21:51]

I was just re-ordering the methods to put them in alphabetical order, but I'll
change it back, since neither you nor xiaochengh like this...

+                                                    const Position& end,
+                                                    Color underlineColor,
+                                                    bool thick,
+                                                    Color backgroundColor) {
+  DCHECK(!m_document->needsLayoutTreeUpdate());
+
+  for (TextIterator markedText(start, end); !markedText.atEnd();
+       markedText.advance()) {
+    addMarker(markedText.currentContainer(),
+              DocumentMarker::createCompositionMarker(
+                  markedText.startOffsetInCurrentContainer(),
+                  markedText.endOffsetInCurrentContainer(), underlineColor,
+                  thick, backgroundColor));
+  }
+}
+
+void DocumentMarkerController::addGrammarOrSpellingMarker(
+    const Position& start,
+    const Position& end,
+    DocumentMarker::MarkerType type,
+    const String& description) {
+  DCHECK(!m_document->needsLayoutTreeUpdate());
   DCHECK(type == DocumentMarker::Grammar || type == DocumentMarker::Spelling);
   // Use a TextIterator to visit the potentially multiple nodes the range
   // covers.
   for (TextIterator markedText(start, end); !markedText.atEnd();
        markedText.advance()) {
     DocumentMarker* marker;
     if (type == DocumentMarker::Grammar) {
       marker = DocumentMarker::createGrammarMarker(
           markedText.startOffsetInCurrentContainer(),
           markedText.endOffsetInCurrentContainer(), description);
     } else {
       marker = DocumentMarker::createSpellingMarker(
           markedText.startOffsetInCurrentContainer(),
           markedText.endOffsetInCurrentContainer(), description);
     }
     addMarker(markedText.currentContainer(), marker);
   }
 }
 
+void DocumentMarkerController::addGrammarMarker(const Position& start,
+                                                const Position& end,
+                                                const String& description) {
+  addGrammarOrSpellingMarker(start, end, DocumentMarker::Grammar, description);
+}
+
+void DocumentMarkerController::addSpellingMarker(const Position& start,
+                                                 const Position& end,
+                                                 const String& description) {
+  addGrammarOrSpellingMarker(start, end, DocumentMarker::Spelling, description);
+}
+
 void DocumentMarkerController::addTextMatchMarker(const EphemeralRange& range,
                                                   bool activeMatch) {
   DCHECK(!m_document->needsLayoutTreeUpdate());
 
   // Use a TextIterator to visit the potentially multiple nodes the range
   // covers.
   for (TextIterator markedText(range.startPosition(), range.endPosition());
        !markedText.atEnd(); markedText.advance()) {
     addMarker(markedText.currentContainer(),
               DocumentMarker::createTextMatchMarker(
                   markedText.startOffsetInCurrentContainer(),
                   markedText.endOffsetInCurrentContainer(), activeMatch));
   }
   // Don't invalidate tickmarks here. TextFinder invalidates tickmarks using a
   // throttling algorithm. crbug.com/6819.
 }
 
-void DocumentMarkerController::addCompositionMarker(const Position& start,

[Xiaocheng, 2017/03/22 02:00:29]

nit: Shouldn't move this function.

-                                                    const Position& end,
-                                                    Color underlineColor,
-                                                    bool thick,
-                                                    Color backgroundColor) {
-  DCHECK(!m_document->needsLayoutTreeUpdate());
-
-  for (TextIterator markedText(start, end); !markedText.atEnd();
-       markedText.advance()) {
-    addMarker(markedText.currentContainer(),
-              DocumentMarker::createCompositionMarker(
-                  markedText.startOffsetInCurrentContainer(),
-                  markedText.endOffsetInCurrentContainer(), underlineColor,
-                  thick, backgroundColor));
-  }
-}
-
 void DocumentMarkerController::prepareForDestruction() {
   clear();
 }
 
 void DocumentMarkerController::removeMarkers(
     const EphemeralRange& range,
     DocumentMarker::MarkerTypes markerTypes,
     RemovePartiallyOverlappingMarkerOrNot
         shouldRemovePartiallyOverlappingMarker) {
   DCHECK(!m_document->needsLayoutTreeUpdate());
@@ skipping 519 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->showMarkers();
 }
 #endif