Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.cpp |
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.cpp |
index 7325d72c3b0046e8295e7a84533cc85b67576013..c97266f7a5aae4a3e36d2ed3032e28734846d0e6 100644 |
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.cpp |
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerListEditor.cpp |
@@ -5,6 +5,7 @@ |
#include "core/editing/markers/DocumentMarkerListEditor.h" |
#include "core/editing/markers/RenderedDocumentMarker.h" |
+#include "core/editing/markers/SpellCheckMarkerListImpl.h" |
namespace blink { |
@@ -128,35 +129,36 @@ bool DocumentMarkerListEditor::ShiftMarkers(MarkerList* list, |
return did_shift_marker; |
} |
-void DocumentMarkerListEditor::AddMarkerAndMergeOverlapping( |
- MarkerList* list, |
- const DocumentMarker* marker) { |
- RenderedDocumentMarker* const rendered_marker = |
+// TODO(rlanday): move to SpellCheckMarkerListImpl.cpp |
+void SpellCheckMarkerListImpl::Add(DocumentMarker* marker) { |
+ RenderedDocumentMarker* rendered_marker = |
RenderedDocumentMarker::Create(*marker); |
- if (list->IsEmpty() || list->back()->EndOffset() < marker->StartOffset()) { |
- list->push_back(rendered_marker); |
+ if (markers_.IsEmpty() || |
+ markers_.back()->EndOffset() < marker->StartOffset()) { |
+ markers_.push_back(rendered_marker); |
return; |
} |
auto first_overlapping = std::lower_bound( |
- list->begin(), list->end(), rendered_marker, |
+ markers_.begin(), markers_.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; |
+ size_t index = first_overlapping - markers_.begin(); |
+ markers_.insert(index, rendered_marker); |
+ const auto inserted = markers_.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();) { |
+ i != markers_.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()); |
+ markers_.erase(i - markers_.begin()); |
} |
} |