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

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

Issue 2883503004: [DMC #7] Only create RenderedDocumentMarkers for TextMatchMarkerListImpl (Closed)
Patch Set: Rebase on InvalidateRectsForAllMarkers() refactor Created 3 years, 7 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
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/SpellCheckMarkerListImpl.h" 5 #include "core/editing/markers/SpellCheckMarkerListImpl.h"
6 6
7 #include "core/editing/markers/DocumentMarkerListEditor.h" 7 #include "core/editing/markers/DocumentMarkerListEditor.h"
8 #include "core/editing/markers/RenderedDocumentMarker.h" 8 #include "core/editing/markers/RenderedDocumentMarker.h"
9 9
10 namespace blink { 10 namespace blink {
11 11
12 bool SpellCheckMarkerListImpl::IsEmpty() const { 12 bool SpellCheckMarkerListImpl::IsEmpty() const {
13 return markers_.IsEmpty(); 13 return markers_.IsEmpty();
14 } 14 }
15 15
16 void SpellCheckMarkerListImpl::Add(DocumentMarker* marker) { 16 void SpellCheckMarkerListImpl::Add(DocumentMarker* marker) {
17 RenderedDocumentMarker* rendered_marker = 17 RenderedDocumentMarker* rendered_marker =
18 RenderedDocumentMarker::Create(*marker); 18 RenderedDocumentMarker::Create(*marker);
19 if (markers_.IsEmpty() || 19 if (markers_.IsEmpty() ||
20 markers_.back()->EndOffset() < marker->StartOffset()) { 20 markers_.back()->EndOffset() < marker->StartOffset()) {
21 markers_.push_back(rendered_marker); 21 markers_.push_back(rendered_marker);
22 return; 22 return;
23 } 23 }
24 24
25 auto first_overlapping = std::lower_bound( 25 auto first_overlapping = std::lower_bound(
26 markers_.begin(), markers_.end(), rendered_marker, 26 markers_.begin(), markers_.end(), rendered_marker,
27 [](const Member<RenderedDocumentMarker>& marker_in_list, 27 [](const Member<DocumentMarker>& marker_in_list,
28 const DocumentMarker* marker_to_insert) { 28 const DocumentMarker* marker_to_insert) {
29 return marker_in_list->EndOffset() < marker_to_insert->StartOffset(); 29 return marker_in_list->EndOffset() < marker_to_insert->StartOffset();
30 }); 30 });
31 31
32 size_t index = first_overlapping - markers_.begin(); 32 size_t index = first_overlapping - markers_.begin();
33 markers_.insert(index, rendered_marker); 33 markers_.insert(index, rendered_marker);
34 const auto inserted = markers_.begin() + index; 34 const auto inserted = markers_.begin() + index;
35 first_overlapping = inserted + 1; 35 first_overlapping = inserted + 1;
36 // TODO(rlanday): optimize this loop so it runs in O(N) time and not O(N^2) 36 // TODO(rlanday): optimize this loop so it runs in O(N) time and not O(N^2)
37 for (const auto i = first_overlapping; 37 for (const auto i = first_overlapping;
38 i != markers_.end() && 38 i != markers_.end() &&
39 (*i)->StartOffset() <= (*inserted)->EndOffset();) { 39 (*i)->StartOffset() <= (*inserted)->EndOffset();) {
40 (*inserted)->SetStartOffset( 40 (*inserted)->SetStartOffset(
41 std::min((*inserted)->StartOffset(), (*i)->StartOffset())); 41 std::min((*inserted)->StartOffset(), (*i)->StartOffset()));
42 (*inserted)->SetEndOffset( 42 (*inserted)->SetEndOffset(
43 std::max((*inserted)->EndOffset(), (*i)->EndOffset())); 43 std::max((*inserted)->EndOffset(), (*i)->EndOffset()));
44 markers_.erase(i - markers_.begin()); 44 markers_.erase(i - markers_.begin());
45 } 45 }
46 } 46 }
47 47
48 void SpellCheckMarkerListImpl::Clear() { 48 void SpellCheckMarkerListImpl::Clear() {
49 markers_.clear(); 49 markers_.clear();
50 } 50 }
51 51
52 const HeapVector<Member<RenderedDocumentMarker>>& 52 const HeapVector<Member<DocumentMarker>>& SpellCheckMarkerListImpl::GetMarkers()
53 SpellCheckMarkerListImpl::GetMarkers() const { 53 const {
54 return markers_; 54 return markers_;
55 } 55 }
56 56
57 bool SpellCheckMarkerListImpl::MoveMarkers(int length, 57 bool SpellCheckMarkerListImpl::MoveMarkers(int length,
58 DocumentMarkerList* dst_list) { 58 DocumentMarkerList* dst_list) {
59 return DocumentMarkerListEditor::MoveMarkers(&markers_, length, dst_list); 59 return DocumentMarkerListEditor::MoveMarkers(&markers_, length, dst_list);
60 } 60 }
61 61
62 bool SpellCheckMarkerListImpl::RemoveMarkers(unsigned start_offset, 62 bool SpellCheckMarkerListImpl::RemoveMarkers(unsigned start_offset,
63 int length) { 63 int length) {
(...skipping 24 matching lines...) Expand all
88 const String& marker_text = node_text.Substring(start, length); 88 const String& marker_text = node_text.Substring(start, length);
89 if (words.Contains(marker_text)) { 89 if (words.Contains(marker_text)) {
90 markers_.erase(j - 1); 90 markers_.erase(j - 1);
91 removed_markers = true; 91 removed_markers = true;
92 } 92 }
93 } 93 }
94 return removed_markers; 94 return removed_markers;
95 } 95 }
96 96
97 } // namespace blink 97 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698