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