[DMC #5] Add 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"
 
 namespace blink {
 
@@ skipping 64 matching lines @@
     if (marker.StartOffset() >= end_offset)
       break;
 
     list->erase(i - list->begin());
     doc_dirty = true;
   }
 
   return doc_dirty;
 }
 
-bool DocumentMarkerListEditor::RemoveMarkersUnderWords(

[Xiaocheng, 2017/04/27 19:04:01]

Could you modify this function in-place, and move it to
SpellCheckMarkerListImpl.cpp in patch #5.5?

-    MarkerList* list,
-    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];
-    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);
-      removed_markers = true;
-    }
-  }
-
-  return removed_markers;
-}
-
 bool DocumentMarkerListEditor::ShiftMarkers(MarkerList* list,
                                             unsigned offset,
                                             unsigned old_length,
                                             unsigned new_length) {
   bool did_shift_marker = false;
   for (MarkerList::iterator it = list->begin(); it != list->end(); ++it) {
     RenderedDocumentMarker& marker = **it;
     Optional<DocumentMarker::MarkerOffsets> result =
         marker.ComputeOffsetsAfterShift(offset, old_length, new_length);
     if (result == WTF::kNullopt) {
       list->erase(it - list->begin());
       --it;
       did_shift_marker = true;
       continue;
     }
 
     if (marker.StartOffset() != result.value().start_offset ||
         marker.EndOffset() != result.value().end_offset) {
       did_shift_marker = true;
       marker.SetStartOffset(result.value().start_offset);
       marker.SetEndOffset(result.value().end_offset);
     }
   }
 
   return did_shift_marker;
 }
 
-void DocumentMarkerListEditor::AddMarkerAndMergeOverlapping(

[Xiaocheng, 2017/04/27 19:04:01]

Could you modify this function in-place, and move it to
SpellCheckMarkerListImpl.cpp in patch #5.5?

[rlanday, 2017/04/27 20:30:13]

I don't think I'm modifying either of these methods, just moving them; I can
move them
in a different CL if you want though

-    MarkerList* list,
-    const DocumentMarker* marker) {
-  RenderedDocumentMarker* rendered_marker =
-      RenderedDocumentMarker::Create(*marker);
-  if (list->IsEmpty() || list->back()->EndOffset() < marker->StartOffset()) {
-    list->push_back(rendered_marker);
-    return;
-  }
-
-  auto first_overlapping = std::lower_bound(
-      list->begin(), list->end(), rendered_marker,
-      [](const Member<RenderedDocumentMarker>& marker_in_list,
-         const DocumentMarker* marker_to_insert) {
-        return marker_in_list->EndOffset() < marker_to_insert->StartOffset();
-      });
-
-  size_t index = first_overlapping - list->begin();
-  list->insert(index, rendered_marker);
-  const auto inserted = list->begin() + index;
-  first_overlapping = inserted + 1;
-  // TODO(rlanday): optimize this loop so it runs in O(N) time and not O(N^2)
-  for (const auto i = first_overlapping;
-       i != list->end() && (*i)->StartOffset() <= (*inserted)->EndOffset();) {
-    (*inserted)->SetStartOffset(
-        std::min((*inserted)->StartOffset(), (*i)->StartOffset()));
-    (*inserted)->SetEndOffset(
-        std::max((*inserted)->EndOffset(), (*i)->EndOffset()));
-    list->erase(i - list->begin());
-  }
-}
-
 }  // namespace blink