OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 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 | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/editing/markers/DocumentMarkerListEditor.h" | 5 #include "core/editing/markers/DocumentMarkerListEditor.h" |
6 | 6 |
7 #include "core/editing/markers/RenderedDocumentMarker.h" | 7 #include "core/editing/markers/RenderedDocumentMarker.h" |
| 8 #include "core/editing/markers/SpellCheckMarkerListImpl.h" |
8 | 9 |
9 namespace blink { | 10 namespace blink { |
10 | 11 |
11 void DocumentMarkerListEditor::AddMarkerWithoutMergingOverlapping( | 12 void DocumentMarkerListEditor::AddMarkerWithoutMergingOverlapping( |
12 MarkerList* list, | 13 MarkerList* list, |
13 const DocumentMarker* marker) { | 14 const DocumentMarker* marker) { |
14 RenderedDocumentMarker* rendered_marker = | 15 RenderedDocumentMarker* rendered_marker = |
15 RenderedDocumentMarker::Create(*marker); | 16 RenderedDocumentMarker::Create(*marker); |
16 if (list->IsEmpty() || list->back()->EndOffset() <= marker->StartOffset()) { | 17 if (list->IsEmpty() || list->back()->EndOffset() <= marker->StartOffset()) { |
17 list->push_back(rendered_marker); | 18 list->push_back(rendered_marker); |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 marker.EndOffset() != result.value().end_offset) { | 122 marker.EndOffset() != result.value().end_offset) { |
122 did_shift_marker = true; | 123 did_shift_marker = true; |
123 marker.SetStartOffset(result.value().start_offset); | 124 marker.SetStartOffset(result.value().start_offset); |
124 marker.SetEndOffset(result.value().end_offset); | 125 marker.SetEndOffset(result.value().end_offset); |
125 } | 126 } |
126 } | 127 } |
127 | 128 |
128 return did_shift_marker; | 129 return did_shift_marker; |
129 } | 130 } |
130 | 131 |
131 void DocumentMarkerListEditor::AddMarkerAndMergeOverlapping( | 132 // TODO(rlanday): move to SpellCheckMarkerListImpl.cpp |
132 MarkerList* list, | 133 void SpellCheckMarkerListImpl::Add(DocumentMarker* marker) { |
133 const DocumentMarker* marker) { | 134 RenderedDocumentMarker* rendered_marker = |
134 RenderedDocumentMarker* const rendered_marker = | |
135 RenderedDocumentMarker::Create(*marker); | 135 RenderedDocumentMarker::Create(*marker); |
136 if (list->IsEmpty() || list->back()->EndOffset() < marker->StartOffset()) { | 136 if (markers_.IsEmpty() || |
137 list->push_back(rendered_marker); | 137 markers_.back()->EndOffset() < marker->StartOffset()) { |
| 138 markers_.push_back(rendered_marker); |
138 return; | 139 return; |
139 } | 140 } |
140 | 141 |
141 auto first_overlapping = std::lower_bound( | 142 auto first_overlapping = std::lower_bound( |
142 list->begin(), list->end(), rendered_marker, | 143 markers_.begin(), markers_.end(), rendered_marker, |
143 [](const Member<RenderedDocumentMarker>& marker_in_list, | 144 [](const Member<RenderedDocumentMarker>& marker_in_list, |
144 const DocumentMarker* marker_to_insert) { | 145 const DocumentMarker* marker_to_insert) { |
145 return marker_in_list->EndOffset() < marker_to_insert->StartOffset(); | 146 return marker_in_list->EndOffset() < marker_to_insert->StartOffset(); |
146 }); | 147 }); |
147 | 148 |
148 size_t index = first_overlapping - list->begin(); | 149 size_t index = first_overlapping - markers_.begin(); |
149 list->insert(index, rendered_marker); | 150 markers_.insert(index, rendered_marker); |
150 const auto inserted = list->begin() + index; | 151 const auto inserted = markers_.begin() + index; |
151 first_overlapping = inserted + 1; | 152 first_overlapping = inserted + 1; |
152 // TODO(rlanday): optimize this loop so it runs in O(N) time and not O(N^2) | 153 // TODO(rlanday): optimize this loop so it runs in O(N) time and not O(N^2) |
153 for (const auto i = first_overlapping; | 154 for (const auto i = first_overlapping; |
154 i != list->end() && (*i)->StartOffset() <= (*inserted)->EndOffset();) { | 155 i != markers_.end() && |
| 156 (*i)->StartOffset() <= (*inserted)->EndOffset();) { |
155 (*inserted)->SetStartOffset( | 157 (*inserted)->SetStartOffset( |
156 std::min((*inserted)->StartOffset(), (*i)->StartOffset())); | 158 std::min((*inserted)->StartOffset(), (*i)->StartOffset())); |
157 (*inserted)->SetEndOffset( | 159 (*inserted)->SetEndOffset( |
158 std::max((*inserted)->EndOffset(), (*i)->EndOffset())); | 160 std::max((*inserted)->EndOffset(), (*i)->EndOffset())); |
159 list->erase(i - list->begin()); | 161 markers_.erase(i - markers_.begin()); |
160 } | 162 } |
161 } | 163 } |
162 | 164 |
163 } // namespace blink | 165 } // namespace blink |
OLD | NEW |