[DMC #2] Add DocumentMarkerList interface and GenericDocumentMarkerListImpl

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

Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
index 06ca1fd2b07349e9d84343416ad38141d9621705..2c4e38c95044ce0f83bfd27ae1ada95a29fa203e 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
@@ -40,6 +40,7 @@
 
 namespace blink {
 
+class DocumentMarkerList;
 class Node;
 class RenderedDocumentMarker;
 class Text;
@@ -127,14 +128,13 @@ class CORE_EXPORT DocumentMarkerController final
                               unsigned new_length) final;
 
  private:
-  void AddMarker(Node*, const DocumentMarker&);
+  void AddMarker(Node*, DocumentMarker*);

[Xiaocheng, 2017/04/20 08:41:34]

Why do we need to change this function?

Can we change it in a different patch?

[rlanday, 2017/04/20 10:03:18]

DocumentMarkerList::AddMarker() needs to take a non-const pointer so we can
modify the DocumentMarker in ShiftMarkers(). The current implementation of
AddMarker() copies the marker (by calling RenderedDocumentMarker::create()
and storing that marker instead) but it is not guaranteed by the interface
that the marker will be copied. So this method also needs to take a non-const
pointer/ref; I changed it to a pointer because my understanding is that the
style guide frowns upon passing non-const refs.

We can change it in a separate patch if you want.

 
-  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>>;
-  static Member<MarkerList>& ListForType(MarkerLists*,
-                                         DocumentMarker::MarkerType);
+  static Member<DocumentMarkerList>& ListForType(MarkerLists*,
+                                                 DocumentMarker::MarkerType);
   bool PossiblyHasMarkers(DocumentMarker::MarkerTypes);
   void RemoveMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);
   void RemoveMarkers(TextIterator&, DocumentMarker::MarkerTypes);