[DMC #2] Add DocumentMarkerList interface and GenericDocumentMarkerListImpl

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 17 matching lines @@
 
 #include "core/editing/markers/DocumentMarkerController.h"
 
 #include <algorithm>
 #include "core/dom/Node.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/Range.h"
 #include "core/dom/Text.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/markers/DocumentMarkerListEditor.h"
+#include "core/editing/markers/GenericDocumentMarkerListImpl.h"
 #include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutObject.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
@@ skipping 23 matching lines @@
     case DocumentMarker::kComposition:
       return DocumentMarker::kCompositionMarkerIndex;
   }
 
   NOTREACHED();
   return DocumentMarker::kSpellingMarkerIndex;
 }
 
 }  // namespace
 
-Member<DocumentMarkerController::MarkerList>&
-DocumentMarkerController::ListForType(MarkerLists* marker_lists,
-                                      DocumentMarker::MarkerType type) {
+Member<DocumentMarkerList>& DocumentMarkerController::ListForType(
+    MarkerLists* marker_lists,
+    DocumentMarker::MarkerType type) {
   const size_t marker_list_index = MarkerTypeToMarkerIndex(type);
   return (*marker_lists)[marker_list_index];
 }
 
 inline bool DocumentMarkerController::PossiblyHasMarkers(
     DocumentMarker::MarkerTypes types) {
   return possibly_existing_marker_types_.Intersects(types);
 }
 
 DocumentMarkerController::DocumentMarkerController(Document& document)
     : possibly_existing_marker_types_(0), document_(&document) {
   SetContext(&document);
 }
 
 void DocumentMarkerController::Clear() {
   markers_.Clear();
   possibly_existing_marker_types_ = 0;
 }
 
 void DocumentMarkerController::AddMarker(const Position& start,
                                          const Position& end,
                                          DocumentMarker::MarkerType type,
                                          const String& description) {
   // Use a TextIterator to visit the potentially multiple nodes the range
   // covers.
   for (TextIterator marked_text(start, end); !marked_text.AtEnd();
        marked_text.Advance()) {
-    AddMarker(
-        marked_text.CurrentContainer(),
-        DocumentMarker(type, marked_text.StartOffsetInCurrentContainer(),
-                       marked_text.EndOffsetInCurrentContainer(), description));
+    AddMarker(marked_text.CurrentContainer(),
+              new DocumentMarker(
+                  type, marked_text.StartOffsetInCurrentContainer(),
+                  marked_text.EndOffsetInCurrentContainer(), description));
   }
 }
 
 void DocumentMarkerController::AddTextMatchMarker(
     const EphemeralRange& range,
     DocumentMarker::MatchStatus match_status) {
   DCHECK(!document_->NeedsLayoutTreeUpdate());
 
   // Use a TextIterator to visit the potentially multiple nodes the range
   // covers.
   for (TextIterator marked_text(range.StartPosition(), range.EndPosition());
        !marked_text.AtEnd(); marked_text.Advance()) {
     AddMarker(marked_text.CurrentContainer(),
-              DocumentMarker(marked_text.StartOffsetInCurrentContainer(),
-                             marked_text.EndOffsetInCurrentContainer(),
-                             match_status));
+              new DocumentMarker(marked_text.StartOffsetInCurrentContainer(),
+                                 marked_text.EndOffsetInCurrentContainer(),
+                                 match_status));
   }
   // Don't invalidate tickmarks here. TextFinder invalidates tickmarks using a
   // throttling algorithm. crbug.com/6819.
 }
 
 void DocumentMarkerController::AddCompositionMarker(const Position& start,
                                                     const Position& end,
                                                     Color underline_color,
                                                     bool thick,
                                                     Color background_color) {
   DCHECK(!document_->NeedsLayoutTreeUpdate());
 
   for (TextIterator marked_text(start, end); !marked_text.AtEnd();
-       marked_text.Advance())
+       marked_text.Advance()) {
     AddMarker(marked_text.CurrentContainer(),
-              DocumentMarker(marked_text.StartOffsetInCurrentContainer(),
-                             marked_text.EndOffsetInCurrentContainer(),
-                             underline_color, thick, background_color));
+              new DocumentMarker(marked_text.StartOffsetInCurrentContainer(),
+                                 marked_text.EndOffsetInCurrentContainer(),
+                                 underline_color, thick, background_color));
+  }
 }
 
 void DocumentMarkerController::PrepareForDestruction() {
   Clear();
 }
 
 void DocumentMarkerController::RemoveMarkers(
     TextIterator& marked_text,
     DocumentMarker::MarkerTypes marker_types) {
   for (; !marked_text.AtEnd(); marked_text.Advance()) {
@@ skipping 40 matching lines @@
   } else {
     marker.NullifyRenderedRect();
   }
   range->Dispose();
 }
 
 // Markers are stored in order sorted by their start offset.
 // Markers of the same type do not overlap each other.
 
 void DocumentMarkerController::AddMarker(Node* node,
-                                         const DocumentMarker& new_marker) {
-  DCHECK_GE(new_marker.EndOffset(), new_marker.StartOffset());
-  if (new_marker.EndOffset() == new_marker.StartOffset())
+                                         DocumentMarker* new_marker) {
+  DCHECK_GE(new_marker->EndOffset(), new_marker->StartOffset());
+  if (new_marker->EndOffset() == new_marker->StartOffset())
     return;
 
-  possibly_existing_marker_types_.Add(new_marker.GetType());
+  possibly_existing_marker_types_.Add(new_marker->GetType());
 
   Member<MarkerLists>& markers =
       markers_.insert(node, nullptr).stored_value->value;
   if (!markers) {
     markers = new MarkerLists;
     markers->Grow(DocumentMarker::kMarkerTypeIndexesCount);
   }
 
-  const DocumentMarker::MarkerType new_marker_type = new_marker.GetType();
+  const DocumentMarker::MarkerType new_marker_type = new_marker->GetType();
   if (!ListForType(markers, new_marker_type))
-    ListForType(markers, new_marker_type) = new MarkerList;
+    ListForType(markers, new_marker_type) = new GenericDocumentMarkerListImpl;
 
-  Member<MarkerList>& list = ListForType(markers, new_marker_type);
-  DocumentMarkerListEditor::AddMarker(list, &new_marker);
+  Member<DocumentMarkerList>& list = ListForType(markers, new_marker_type);
+  list->Add(new_marker);
 
   // repaint the affected node
   if (node->GetLayoutObject()) {
     node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
   }
 }
 
 // Moves markers from src_node to dst_node. Markers are moved if their start
 // offset is less than length. Markers that run past that point are truncated.
@@ skipping 13 matching lines @@
 
   if (!markers_.Contains(dst_node)) {
     markers_.insert(dst_node,
                     new MarkerLists(DocumentMarker::kMarkerTypeIndexesCount));
   }
   MarkerLists* dst_markers = markers_.at(dst_node);
 
   bool doc_dirty = false;
   for (size_t marker_list_index = 0; marker_list_index < src_markers->size();
        ++marker_list_index) {
-    MarkerList* src_list = src_markers->at(marker_list_index);
+    DocumentMarkerList* src_list = src_markers->at(marker_list_index);
     if (!src_list)
       continue;
 
     if (!dst_markers->at(marker_list_index))
-      dst_markers->at(marker_list_index) = new MarkerList;
-    MarkerList* dst_list = dst_markers->at(marker_list_index);
+      dst_markers->at(marker_list_index) = new GenericDocumentMarkerListImpl;
 
-    if (DocumentMarkerListEditor::MoveMarkers(src_list, length, dst_list))
+    if (src_list->MoveMarkers(length, dst_markers->at(marker_list_index)))
       doc_dirty = true;
   }
 
   // repaint the affected node
   if (doc_dirty && dst_node->GetLayoutObject()) {
     dst_node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
   }
 }
 
 void DocumentMarkerController::RemoveMarkers(
     Node* node,
     unsigned start_offset,
     int length,
     DocumentMarker::MarkerTypes marker_types) {
   if (length <= 0)
     return;
 
   if (!PossiblyHasMarkers(marker_types))
     return;
   DCHECK(!(markers_.IsEmpty()));
 
   MarkerLists* markers = markers_.at(node);
   if (!markers)
     return;
 
   bool doc_dirty = false;
   size_t empty_lists_count = 0;
-  for (size_t marker_list_index = 0;
-       marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
-       ++marker_list_index) {
-    Member<MarkerList>& list = (*markers)[marker_list_index];
+  for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
+    size_t marker_list_index = MarkerTypeToMarkerIndex(type);
+    DocumentMarkerList* list = (*markers)[marker_list_index];
     if (!list || list->IsEmpty()) {
-      if (list.Get() && list->IsEmpty())
-        list.Clear();
+      if (list && list->IsEmpty())
+        (*markers)[marker_list_index] = nullptr;
       ++empty_lists_count;
       continue;
     }
-    if (!marker_types.Contains((*list->begin())->GetType()))
+    if (!marker_types.Contains(type))
       continue;
 
-    if (DocumentMarkerListEditor::RemoveMarkers(list, start_offset, length))
+    if (list->RemoveMarkers(start_offset, length))
       doc_dirty = true;
 
     if (list->IsEmpty()) {
-      list.Clear();
+      (*markers)[marker_list_index] = nullptr;
       ++empty_lists_count;
     }
   }
 
   if (empty_lists_count == DocumentMarker::kMarkerTypeIndexesCount) {
     markers_.erase(node);
     if (markers_.IsEmpty())
       possibly_existing_marker_types_ = 0;
   }
 
   // repaint the affected node
   if (doc_dirty && node->GetLayoutObject()) {
     node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
   }
 }
 
 DocumentMarkerVector DocumentMarkerController::MarkersFor(
     Node* node,
     DocumentMarker::MarkerTypes marker_types) {
   DocumentMarkerVector result;
 
   MarkerLists* markers = markers_.at(node);
   if (!markers)
     return result;
 
-  for (size_t marker_list_index = 0;
-       marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
-       ++marker_list_index) {
-    Member<MarkerList>& list = (*markers)[marker_list_index];
-    if (!list || list->IsEmpty() ||
-        !marker_types.Contains((*list->begin())->GetType()))
+  for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
+    size_t marker_list_index = MarkerTypeToMarkerIndex(type);
+    DocumentMarkerList* list = (*markers)[marker_list_index];
+    if (!list || list->IsEmpty() || !marker_types.Contains(type))
       continue;
 
-    for (size_t i = 0; i < list->size(); ++i)
-      result.push_back(list->at(i).Get());
+    list->AppendMarkersToInputList(&result);

[yosin_UTC9, 2017/04/20 05:28:46]

I prefer to have list->GetMarkers() -> Vector<Member<DocumentMarker>> as more
C++11-ish.

It seems we have more usage patterns of AppendmarkkerToInputList() as
  DocumentMarkerVector markers_in_list;
  list->AppendMarkersToInputList(&markers_in_list);

Some cases don't require copying vector.

We could write:
const Vector<Member<DocumentMarker>> markers = list->GetMarkers();
result.insert(result.end(), markers.begin(), markers.end());

   }
 
   std::sort(result.begin(), result.end(), CompareByStart);
   return result;
 }
 
 DocumentMarkerVector DocumentMarkerController::Markers() {
   DocumentMarkerVector result;
   for (MarkerMap::iterator i = markers_.begin(); i != markers_.end(); ++i) {
     MarkerLists* markers = i->value.Get();
     for (size_t marker_list_index = 0;
          marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
          ++marker_list_index) {
-      Member<MarkerList>& list = (*markers)[marker_list_index];
-      for (size_t j = 0; list.Get() && j < list->size(); ++j)
-        result.push_back(list->at(j).Get());
+      DocumentMarkerList* list = (*markers)[marker_list_index];
+      if (!list)
+        continue;
+      list->AppendMarkersToInputList(&result);
     }
   }
   std::sort(result.begin(), result.end(), CompareByStart);
   return result;
 }
 
 DocumentMarkerVector DocumentMarkerController::MarkersInRange(
     const EphemeralRange& range,
     DocumentMarker::MarkerTypes marker_types) {
   if (!PossiblyHasMarkers(marker_types))
@@ skipping 34 matching lines @@
 
   // outer loop: process each node
   MarkerMap::iterator end = markers_.end();
   for (MarkerMap::iterator node_iterator = markers_.begin();
        node_iterator != end; ++node_iterator) {
     // inner loop; process each marker in this node
     const Node& node = *node_iterator->key;
     if (!node.isConnected())
       continue;
     MarkerLists* markers = node_iterator->value.Get();
-    for (size_t marker_list_index = 0;
-         marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
-         ++marker_list_index) {
-      Member<MarkerList>& list = (*markers)[marker_list_index];
-      if (!list || list->IsEmpty() ||
-          (*list->begin())->GetType() != marker_type)
+    for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
+      size_t marker_list_index = MarkerTypeToMarkerIndex(type);
+      DocumentMarkerList* list = (*markers)[marker_list_index];
+      if (!list || list->IsEmpty() || type != marker_type)
         continue;
-      for (unsigned marker_index = 0; marker_index < list->size();
-           ++marker_index) {
-        RenderedDocumentMarker* marker = list->at(marker_index).Get();
-        UpdateMarkerRenderedRectIfNeeded(node, *marker);
-        if (!marker->IsRendered())
+
+      DocumentMarkerVector markers_in_list;
+      list->AppendMarkersToInputList(&markers_in_list);
+
+      for (DocumentMarker* marker : markers_in_list) {
+        RenderedDocumentMarker* rendered_marker =
+            ToRenderedDocumentMarker(marker);
+        UpdateMarkerRenderedRectIfNeeded(node, *rendered_marker);
+        if (!rendered_marker->IsRendered())
           continue;
-        result.push_back(marker->RenderedRect());
+        result.push_back(rendered_marker->RenderedRect());
       }
     }
   }
 
   return result;
 }
 
 static void InvalidatePaintForTickmarks(const Node& node) {
   if (FrameView* frame_view = node.GetDocument().View())
     frame_view->InvalidatePaintForTickmarks();
 }
 
 void DocumentMarkerController::UpdateMarkerRenderedRectIfNeeded(
     const Node& node,
     RenderedDocumentMarker& marker) {
   DCHECK(!document_->View() || !document_->View()->NeedsLayout());
   DCHECK(!document_->NeedsLayoutTreeUpdate());
   if (!marker.IsValid())
     UpdateMarkerRenderedRect(node, marker);
 }
 
 void DocumentMarkerController::InvalidateRectsForMarkersInNode(
     const Node& node) {
   MarkerLists* markers = markers_.at(&node);
 
   for (auto& marker_list : *markers) {
     if (!marker_list || marker_list->IsEmpty())
       continue;
 
-    for (auto& marker : *marker_list)
-      marker->Invalidate();
+    DocumentMarkerVector markers_in_list;
+    marker_list->AppendMarkersToInputList(&markers_in_list);
+    for (auto& marker : markers_in_list)
+      ToRenderedDocumentMarker(marker)->Invalidate();
 
-    if (marker_list->front()->GetType() == DocumentMarker::kTextMatch)
+    if (markers_in_list.front()->GetType() == DocumentMarker::kTextMatch)
       InvalidatePaintForTickmarks(node);
   }
 }
 
 void DocumentMarkerController::InvalidateRectsForAllMarkers() {
   for (auto& node_markers : markers_) {
     const Node& node = *node_markers.key;
     for (auto& marker_list : *node_markers.value) {
       if (!marker_list || marker_list->IsEmpty())
         continue;
 
-      for (auto& marker : *marker_list)
-        marker->Invalidate();
+      DocumentMarkerVector markers_in_list;
+      marker_list->AppendMarkersToInputList(&markers_in_list);
+      for (DocumentMarker* marker : markers_in_list)
+        ToRenderedDocumentMarker(marker)->Invalidate();
 
-      if (marker_list->front()->GetType() == DocumentMarker::kTextMatch)
+      if (markers_in_list.front()->GetType() == DocumentMarker::kTextMatch)
         InvalidatePaintForTickmarks(node);
     }
   }
 }
 
 DEFINE_TRACE(DocumentMarkerController) {
   visitor->Trace(markers_);
   visitor->Trace(document_);
   SynchronousMutationObserver::Trace(visitor);
 }
@@ skipping 13 matching lines @@
 void DocumentMarkerController::RemoveMarkers(
     const MarkerRemoverPredicate& should_remove_marker) {
   for (auto& node_markers : markers_) {
     const Node& node = *node_markers.key;
     if (!node.IsTextNode())  // MarkerRemoverPredicate requires a Text node.
       continue;
     MarkerLists& markers = *node_markers.value;
     for (size_t marker_list_index = 0;
          marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
          ++marker_list_index) {
-      Member<MarkerList>& list = markers[marker_list_index];
+      DocumentMarkerList* list = markers[marker_list_index];
       if (!list)
         continue;
       bool removed_markers = false;
-      for (size_t j = list->size(); j > 0; --j) {
-        if (should_remove_marker(*list->at(j - 1),
+
+      DocumentMarkerVector markers_in_list;
+      list->AppendMarkersToInputList(&markers_in_list);
+
+      for (size_t j = markers_in_list.size(); j > 0; --j) {
+        if (should_remove_marker(*markers_in_list[j - 1],
                                  static_cast<const Text&>(node))) {
-          list->erase(j - 1);
+          markers_in_list.erase(j - 1);
           removed_markers = true;
         }
       }
+
+      list->Clear();
+      for (DocumentMarker* marker : markers_in_list)
+        list->Add(marker);
+
       if (removed_markers &&
           marker_list_index == DocumentMarker::kTextMatchMarkerIndex)
         InvalidatePaintForTickmarks(node);
     }
   }
 }
 
 void DocumentMarkerController::RemoveMarkers(
     DocumentMarker::MarkerTypes marker_types) {
   if (!PossiblyHasMarkers(marker_types))
@@ skipping 18 matching lines @@
   bool needs_repainting = false;
   bool node_can_be_removed;
 
   size_t empty_lists_count = 0;
   if (marker_types == DocumentMarker::AllMarkers()) {
     needs_repainting = true;
     node_can_be_removed = true;
   } else {
     MarkerLists* markers = iterator->value.Get();
 
-    for (size_t marker_list_index = 0;
-         marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
-         ++marker_list_index) {
-      Member<MarkerList>& list = (*markers)[marker_list_index];
+    for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
+      size_t marker_list_index = MarkerTypeToMarkerIndex(type);
+      DocumentMarkerList* list = (*markers)[marker_list_index];
       if (!list || list->IsEmpty()) {
-        if (list.Get() && list->IsEmpty())
-          list.Clear();
+        if (list && list->IsEmpty())
+          (*markers)[marker_list_index] = nullptr;
         ++empty_lists_count;
         continue;
       }
-      if (marker_types.Contains((*list->begin())->GetType())) {
-        list->clear();
-        list.Clear();
+      if (marker_types.Contains(type)) {
+        list->Clear();
+        ListForType(markers, type) = nullptr;
         ++empty_lists_count;
         needs_repainting = true;
       }
     }
 
     node_can_be_removed =
         empty_lists_count == DocumentMarker::kMarkerTypeIndexesCount;
   }
 
   if (needs_repainting) {
@@ skipping 18 matching lines @@
     return;
   DCHECK(!markers_.IsEmpty());
 
   // outer loop: process each markered node in the document
   MarkerMap::iterator end = markers_.end();
   for (MarkerMap::iterator i = markers_.begin(); i != end; ++i) {
     const Node* node = i->key;
 
     // inner loop: process each marker in the current node
     MarkerLists* markers = i->value.Get();
-    for (size_t marker_list_index = 0;
-         marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
-         ++marker_list_index) {
-      Member<MarkerList>& list = (*markers)[marker_list_index];
-      if (!list || list->IsEmpty() ||
-          !marker_types.Contains((*list->begin())->GetType()))
+    for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
+      size_t marker_list_index = MarkerTypeToMarkerIndex(type);
+      DocumentMarkerList* list = (*markers)[marker_list_index];
+      if (!list || list->IsEmpty() || !marker_types.Contains(type))
         continue;
 
       // cause the node to be redrawn
       if (LayoutObject* layout_object = node->GetLayoutObject()) {
         layout_object->SetShouldDoFullPaintInvalidation(
             kPaintInvalidationDocumentMarkerChange);
         break;
       }
     }
   }
@@ skipping 27 matching lines @@
 
 bool DocumentMarkerController::SetMarkersActive(Node* node,
                                                 unsigned start_offset,
                                                 unsigned end_offset,
                                                 bool active) {
   MarkerLists* markers = markers_.at(node);
   if (!markers)
     return false;
 
   bool doc_dirty = false;
-  Member<MarkerList>& list = ListForType(markers, DocumentMarker::kTextMatch);
+  DocumentMarkerList* list = ListForType(markers, DocumentMarker::kTextMatch);
+
   if (!list)
     return false;
-  MarkerList::iterator start_pos = std::upper_bound(
-      list->begin(), list->end(), start_offset, DocumentMarker::EndsBefore);
-  for (MarkerList::iterator marker = start_pos; marker != list->end();
-       ++marker) {
+
+  DocumentMarkerVector markers_in_list;
+  list->AppendMarkersToInputList(&markers_in_list);
+
+  const auto start_pos =
+      std::upper_bound(markers_in_list.begin(), markers_in_list.end(),
+                       start_offset, DocumentMarker::EndsBefore);
+  for (auto marker = start_pos; marker != markers_in_list.end(); ++marker) {
     // Markers are returned in order, so stop if we are now past the specified
     // range.
     if ((*marker)->StartOffset() >= end_offset)
       break;
 
     (*marker)->SetIsActiveMatch(active);
     doc_dirty = true;
   }
 
   // repaint the affected node
   if (doc_dirty && node->GetLayoutObject()) {
     node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
   }
   return doc_dirty;
 }
 
 #ifndef NDEBUG
 void DocumentMarkerController::ShowMarkers() const {
   StringBuilder builder;
   MarkerMap::const_iterator end = markers_.end();
   for (MarkerMap::const_iterator node_iterator = markers_.begin();
        node_iterator != end; ++node_iterator) {
     const Node* node = node_iterator->key;
     builder.Append(String::Format("%p", node));
     MarkerLists* markers = markers_.at(node);
     for (size_t marker_list_index = 0;
          marker_list_index < DocumentMarker::kMarkerTypeIndexesCount;
          ++marker_list_index) {
-      Member<MarkerList>& list = (*markers)[marker_list_index];
-      for (unsigned marker_index = 0; list.Get() && marker_index < list->size();
-           ++marker_index) {
-        DocumentMarker* marker = list->at(marker_index).Get();
+      DocumentMarkerList* list = (*markers)[marker_list_index];
+
+      DocumentMarkerVector markers_in_list;
+      list->AppendMarkersToInputList(&markers_in_list);
+
+      for (const DocumentMarker* marker : markers_in_list) {
         builder.Append(" ");
         builder.AppendNumber(marker->GetType());
         builder.Append(":[");
         builder.AppendNumber(marker->StartOffset());
         builder.Append(":");
         builder.AppendNumber(marker->EndOffset());
         builder.Append("](");
         builder.AppendNumber(marker->IsActiveMatch());
         builder.Append(")");
       }
@@ skipping 12 matching lines @@
                                                       unsigned new_length) {
   if (!PossiblyHasMarkers(DocumentMarker::AllMarkers()))
     return;
   DCHECK(!markers_.IsEmpty());
 
   MarkerLists* markers = markers_.at(node);
   if (!markers)
     return;
 
   bool did_shift_marker = false;
-  for (MarkerList* list : *markers) {
+  for (DocumentMarkerList* list : *markers) {
     if (!list)
       continue;
 
-    if (DocumentMarkerListEditor::ShiftMarkers(list, offset, old_length,
-                                               new_length))
+    if (list->ShiftMarkers(offset, old_length, new_length))
       did_shift_marker = true;
   }
 
   if (!did_shift_marker)
     return;
   if (!node->GetLayoutObject())
     return;
   InvalidateRectsForMarkersInNode(*node);
   // repaint the affected node
   node->GetLayoutObject()->SetShouldDoFullPaintInvalidation();
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif