[WIP] Clean up DocumentMarkerController API

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

 /*
  * 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 29 matching lines @@
 
 namespace blink {
 
 class CompositionMarkerList;
 class DocumentMarkerList;
 class GrammarMarkerList;
 class Node;
 class SpellingMarkerList;
 class TextMatchMarkerList;
 
-class MarkerRemoverPredicate final {
- public:
-  explicit MarkerRemoverPredicate(const Vector<String>& words);
-  bool operator()(const DocumentMarker&, const Text&) const;
-
-  Vector<String> m_words;
-};
-
 class CORE_EXPORT DocumentMarkerController final
     : public GarbageCollected<DocumentMarkerController>,
       public SynchronousMutationObserver {
   WTF_MAKE_NONCOPYABLE(DocumentMarkerController);
   USING_GARBAGE_COLLECTED_MIXIN(DocumentMarkerController);
 
  public:
   explicit DocumentMarkerController(Document&);
 
   void clear();
   void addMarker(Node*, DocumentMarker*);
-  void addMarker(const Position& start,
-                 const Position& end,
-                 DocumentMarker::MarkerType,
-                 const String& description = emptyString);
-  void addTextMatchMarker(const EphemeralRange&, bool activeMatch);
+
   void addCompositionMarker(const Position& start,
                             const Position& end,
                             Color underlineColor,
                             bool thick,
                             Color backgroundColor);
+  void addGrammarMarker(const Position& start,

[yosin_UTC9, 2017/03/21 05:46:55]

Could you introduce them one-by-one to make patch smaller?

+                        const Position& end,
+                        const String& description = emptyString);
+  void addSpellingMarker(const Position& start,
+                         const Position& end,
+                         const String& description = emptyString);
+  void addTextMatchMarker(const Position& start,

[yosin_UTC9, 2017/03/21 05:46:55]

We prefer to use |EPhemeralRange| instead of passing two |Positions|.
Please keep |addTextMatchMarker()| as is.

Note: We don't need to make to use |addSpellingMarker()| to |addGrammarMakrer()|
to use |EphemeralRange| when introducing them.
It should be yet another patch of introducing them to make each patch smaller.

+                          const Position& end,
+                          bool activeMatch);
 
   void copyMarkers(Node* srcNode,
                    unsigned startOffset,
                    int length,
                    Node* dstNode,
                    int delta);
 
   void prepareForDestruction();
   // When a marker partially overlaps with range, if
   // removePartiallyOverlappingMarkers is true, we completely remove the marker.
@@ skipping 12 matching lines @@
                      int length,
                      DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers(),
                      RemovePartiallyOverlappingMarkerOrNot =
                          DoNotRemovePartiallyOverlappingMarker);
 
   void removeMarkers(
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void removeMarkers(
       Node*,
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
-  void removeMarkers(const MarkerRemoverPredicate& shouldRemoveMarker);
+  void removeSpellingMarkersForWords(const Vector<String>& words);
   void repaintMarkers(
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   // Returns true if markers within a range are found.
-  bool setMarkersActive(const EphemeralRange&, bool);
+  bool setTextMatchMarkersActive(const EphemeralRange&, bool);
   // Returns true if markers within a range defined by a node, |startOffset| and
   // |endOffset| are found.
-  bool setMarkersActive(Node*, unsigned startOffset, unsigned endOffset, bool);
+  bool setTextMatchMarkersActive(Node*,
+                                 unsigned startOffset,
+                                 unsigned endOffset,
+                                 bool);
   bool hasMarkers(Node*) const;
 
   DocumentMarkerVector markersFor(
       Node*,
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   DocumentMarkerVector markersInRange(const EphemeralRange&,
                                       DocumentMarker::MarkerTypes);
   DocumentMarkerVector markers();
-  Vector<IntRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
-
-  void invalidateRectsForAllMarkers();
-  void invalidateRectsForMarkersInNode(Node&);
+  Vector<IntRect> renderedRectsForTextMatchMarkers();
+  void invalidateRectsForAllTextMatchMarkers();
+  void invalidateRectsForTextMatchMarkersInNode(Node&);
 
   DECLARE_TRACE();
 
 #ifndef NDEBUG
   void showMarkers() const;
 #endif
 
   // SynchronousMutationObserver
   void didUpdateCharacterData(CharacterData*,
                               unsigned offset,
@@ skipping 41 matching lines @@
     auto it = markerMap->find(node);
     if (it != markerMap->end()) {
       it->value->removeMarkers(startOffset, length,
                                shouldRemovePartiallyOverlappingMarker,
                                docDirty);
       if (it->value->empty())
         markerMap->remove(node);
     }
   }
 
+  void addGrammarOrSpellingMarker(const Position& start,
+                                  const Position& end,
+                                  DocumentMarker::MarkerType,
+                                  const String& description);
   HeapVector<Member<DocumentMarkerList>> getMarkerListsForNode(
       Node*,
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void removeMarkers(TextIterator&,
                      DocumentMarker::MarkerTypes,
                      RemovePartiallyOverlappingMarkerOrNot);
 
   MarkerMap<SpellingMarkerList> m_spelling;
   MarkerMap<GrammarMarkerList> m_grammar;
   MarkerMap<TextMatchMarkerList> m_textMatches;
   MarkerMap<CompositionMarkerList> m_compositions;
 
   const Member<const Document> m_document;
 };
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController*);
 #endif
 
 #endif  // DocumentMarkerController_h