Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: third_party/WebKit/Source/core/editing/markers/SpellCheckMarkerList.cpp

Issue 2805553003: DocumentMarkerList refactor as an interface (Closed)
Patch Set: Respond to comments, fill in unimplemented methods Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
(Empty)
1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "core/editing/markers/SpellCheckMarkerList.h"
6
7 #include "core/editing/markers/DocumentMarkerListEditor.h"
8
9 namespace blink {
10
11 SpellCheckMarkerList::SpellCheckMarkerList(DocumentMarker::MarkerType type)
12 : m_type(type) {}
13
14 DocumentMarker::MarkerType SpellCheckMarkerList::allowedMarkerType() const {
15 return m_type;
16 }
17
18 bool SpellCheckMarkerList::empty() const {
19 return m_markers.isEmpty();
20 }
21
22 DocumentMarker* SpellCheckMarkerList::at(size_t index) {
23 return m_markers[index].get();
24 }
25
26 void SpellCheckMarkerList::add(DocumentMarker* marker) {
27 DCHECK_EQ(marker->type(), allowedMarkerType())
28 << "Marker of type " << marker->type() << " added; should be of type "
29 << allowedMarkerType();
30 // Optimize case where (non-merging) markers are being added in order so we
31 // can add n markers in O(n) time instead of O(n log n)
32 if (m_markers.isEmpty() ||
33 m_markers.back()->endOffset() < marker->startOffset()) {
34 m_markers.push_back(marker);
35 return;
36 }
37
38 const auto& firstOverlappingIt = std::lower_bound(
39 m_markers.begin(), m_markers.end(), marker,
40 [](const Member<DocumentMarker>& lhv, const DocumentMarker* rhv) {
41 return lhv->endOffset() < rhv->startOffset();
42 });
43
44 size_t index = firstOverlappingIt - m_markers.begin();
45 m_markers.insert(index, marker);
46 const auto& insertedIt = m_markers.begin() + index;
47
48 unsigned newStart = marker->startOffset();
49 unsigned newEnd = marker->endOffset();
50
51 iterator it;
52 for (it = insertedIt + 1;
53 it != m_markers.end() && (*it)->startOffset() <= newEnd; ++it) {
54 newStart = std::min(newStart, (*it)->startOffset());
55 newEnd = std::max(newEnd, (*it)->endOffset());
56 }
57 m_markers.erase(index + 1, it - (insertedIt + 1));
58
59 (*insertedIt)->setStartOffset(newStart);
60 (*insertedIt)->setEndOffset(newEnd);
61 }
62
63 void SpellCheckMarkerList::clear() {
64 m_markers.clear();
65 }
66
67 void SpellCheckMarkerList::appendMarkersToInputList(
68 DocumentMarkerVector* list) const {
69 DocumentMarkerListEditor::appendMarkersToInputList(m_markers, list);
70 }
71
72 DocumentMarkerList::DidCopyMarkerOrNot SpellCheckMarkerList::copyMarkers(
73 unsigned startOffset,
74 int length,
75 DocumentMarkerList* dstList,
76 int delta) {
77 return DocumentMarkerListEditor::copySortedMarkers(&m_markers, startOffset,
78 length, dstList, delta);
79 }
80
81 DocumentMarkerList::DidRemoveMarkerOrNot SpellCheckMarkerList::removeMarkers(
82 unsigned startOffset,
83 int length,
84 bool shouldRemovePartiallyOverlappingMarkers) {
85 return DocumentMarkerListEditor::removeSortedMarkers(
86 &m_markers, startOffset, length, shouldRemovePartiallyOverlappingMarkers);
87 }
88
89 DocumentMarkerList::DidShiftMarkerOrNot SpellCheckMarkerList::shiftMarkers(
90 unsigned offset,
91 unsigned oldLength,
92 unsigned newLength) {
93 return DocumentMarkerListEditor::shiftSortedMarkers(&m_markers, offset,
94 oldLength, newLength);
95 }
96
97 DEFINE_TRACE(SpellCheckMarkerList) {
98 visitor->trace(m_markers);
99 DocumentMarkerList::trace(visitor);
100 }
101
102 void SpellCheckMarkerList::removeMarkersForWords(const String& nodeText,
103 const Vector<String>& words) {
104 // Build a second vector and swap with m_markers to avoid O(n^2) performance
105 HeapVector<Member<DocumentMarker>> newMarkerList;
106 std::copy_if(m_markers.begin(), m_markers.end(),
107 std::back_inserter(newMarkerList),
108 [&nodeText, &words](Member<DocumentMarker> marker) {
109 unsigned start = marker->startOffset();
110 unsigned length = marker->endOffset() - marker->startOffset();
111 const String& markerText = nodeText.substring(start, length);
112 return !words.contains(markerText);
113 });
114
115 std::swap(m_markers, newMarkerList);
116 }
117
118 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698