[DMC #1] Refactor DocumentMarkerController on top of new DocumentMarkerListEditor class

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 35 matching lines @@
 
 class MarkerRemoverPredicate final {
  public:
   explicit MarkerRemoverPredicate(const Vector<String>& words);
   bool operator()(const DocumentMarker&, const Text&) const;
 
  private:
   Vector<String> words_;
 };
 
+class DocumentMarkerListEditor {
+ public:
+  using MarkerList = HeapVector<Member<RenderedDocumentMarker>>;
+
+  static void AddMarker(MarkerList*, const DocumentMarker*);
+
+  // Returns true if a marker was removed, false otherwise.
+  static bool RemoveMarkers(MarkerList*, unsigned start_offset, int length);
+
+  // Returns true if a marker was shifted or removed, false otherwise.
+  static bool ShiftMarkers(MarkerList*,
+                           unsigned offset,
+                           unsigned old_length,
+                           unsigned new_length);
+
+ private:
+  static void MergeOverlapping(MarkerList*, RenderedDocumentMarker* to_insert);
+};
+
 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();
@@ skipping 60 matching lines @@
                               unsigned old_length,
                               unsigned new_length) final;
 
  private:
   void AddMarker(Node*, const DocumentMarker&);
 
   using MarkerList = HeapVector<Member<RenderedDocumentMarker>>;
   using MarkerLists =
       HeapVector<Member<MarkerList>, DocumentMarker::kMarkerTypeIndexesCount>;
   using MarkerMap = HeapHashMap<WeakMember<const Node>, Member<MarkerLists>>;
-  void MergeOverlapping(MarkerList*, RenderedDocumentMarker*);
   bool PossiblyHasMarkers(DocumentMarker::MarkerTypes);
   void RemoveMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);
   void RemoveMarkers(TextIterator&, DocumentMarker::MarkerTypes);
 
   MarkerMap markers_;
   // Provide a quick way to determine whether a particular marker type is absent
   // without going through the map.
   DocumentMarker::MarkerTypes possibly_existing_marker_types_;
   const Member<const Document> document_;
 };
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController*);
 #endif
 
 #endif  // DocumentMarkerController_h