[DMC #5.7] Move DocumentMarkerList::RemoveMarkersUnderWords() to SpellCheckMarkerListImpl

third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.cpp

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/markers/DocumentMarkerListEditor.h"
 
 #include "core/editing/markers/RenderedDocumentMarker.h"
+#include "core/editing/markers/SpellCheckMarkerListImpl.h"
 
 namespace blink {
 
 void DocumentMarkerListEditor::AddMarkerWithoutMergingOverlapping(
     MarkerList* list,
     const DocumentMarker* marker) {
   RenderedDocumentMarker* rendered_marker =
       RenderedDocumentMarker::Create(*marker);
   if (list->IsEmpty() || list->back()->EndOffset() <= marker->StartOffset()) {
     list->push_back(rendered_marker);
@@ skipping 57 matching lines @@
     if (marker.StartOffset() >= end_offset)
       break;
 
     list->erase(i - list->begin());
     doc_dirty = true;
   }
 
   return doc_dirty;
 }
 
-bool DocumentMarkerListEditor::RemoveMarkersUnderWords(
-    MarkerList* list,
+// TODO(rlanday): move to SpellCheckMarkerListImpl.cpp
+bool SpellCheckMarkerListImpl::RemoveMarkersUnderWords(
     const String& node_text,
     const Vector<String>& words) {
   bool removed_markers = false;
-  for (size_t j = list->size(); j > 0; --j) {
-    const DocumentMarker& marker = *(*list)[j - 1];
+  for (size_t j = markers_.size(); j > 0; --j) {
+    const DocumentMarker& marker = *markers_[j - 1];
     const unsigned start = marker.StartOffset();
     const unsigned length = marker.EndOffset() - marker.StartOffset();
     const String& marker_text = node_text.Substring(start, length);
     if (words.Contains(marker_text)) {
-      list->erase(j - 1);
+      markers_.erase(j - 1);
       removed_markers = true;
     }
   }
 
   return removed_markers;
 }
 
 bool DocumentMarkerListEditor::ShiftMarkers(MarkerList* list,
                                             unsigned offset,
                                             unsigned old_length,
@@ skipping 15 matching lines @@
       did_shift_marker = true;
       marker.SetStartOffset(result.value().start_offset);
       marker.SetEndOffset(result.value().end_offset);
     }
   }
 
   return did_shift_marker;
 }
 
 }  // namespace blink