[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 20 matching lines @@
 
 #include "core/CoreExport.h"
 #include "core/dom/SynchronousMutationObserver.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/markers/DocumentMarker.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/Vector.h"
 
+// TODO: remove
+#include "core/editing/markers/RenderedDocumentMarker.h"

[rlanday, 2017/04/13 02:31:45]

oops, I can remove this, I was implementing DocumentMarkerList in the header
while I was working and I needed to temporarily add this

+
 namespace blink {
 
 class Node;
 class RenderedDocumentMarker;
 class Text;
 
 class MarkerRemoverPredicate final {
  public:
   explicit MarkerRemoverPredicate(const Vector<String>& words);
   bool operator()(const DocumentMarker&, const Text&) const;
 
  private:
   Vector<String> words_;
 };
 
+class DocumentMarkerList

[Xiaocheng, 2017/04/13 02:39:51]

Let's use another name, say, GenericDocumentMarkerList, because we will
introduce a DocumentMarkerList interface later.

+    : public GarbageCollectedFinalized<DocumentMarkerList> {
+ public:
+  bool IsEmpty() const;
+
+  void Add(DocumentMarker*);
+  void Clear();
+
+  void AppendMarkersToInputList(DocumentMarkerVector* input_list) const;
+
+  bool MoveMarkers(int length, DocumentMarkerList* dst_list);
+  bool RemoveMarkers(unsigned start_offset, int length);
+  bool ShiftMarkers(unsigned offset, unsigned old_length, unsigned new_length);
+
+  DECLARE_TRACE();
+
+ private:
+  void MergeOverlapping(DocumentMarker*);
+
+  HeapVector<Member<DocumentMarker>> markers_;

[Xiaocheng, 2017/04/13 02:39:51]

RenderedDocumentMarker is another (big) source of mess.

To make this patch small and focused on one thing (encapsulate the marker
maintenance logic into a dedicated class), I think we should keep
RenderedDocumentMarker in this patch, and clean it up later.

[yosin_UTC9, 2017/04/13 05:53:57]

I agree. We would like to have small and focused patch.

+};
+
 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 54 matching lines @@
   void ShowMarkers() const;
 #endif
 
   // SynchronousMutationObserver
   void DidUpdateCharacterData(CharacterData*,
                               unsigned offset,
                               unsigned old_length,
                               unsigned new_length) final;
 
  private:
-  void AddMarker(Node*, const DocumentMarker&);
+  void AddMarker(Node*, const DocumentMarker*);
 
-  using MarkerList = HeapVector<Member<RenderedDocumentMarker>>;
-  using MarkerLists =
-      HeapVector<Member<MarkerList>, DocumentMarker::kMarkerTypeIndexesCount>;
+  using MarkerLists = HeapVector<Member<DocumentMarkerList>,
+                                 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