| Index: Source/core/dom/DocumentMarkerController.cpp
|
| diff --git a/Source/core/dom/DocumentMarkerController.cpp b/Source/core/dom/DocumentMarkerController.cpp
|
| index 5a7cc9b47afb89e7f4f28bc2d60120995ec16109..87da3061bfe65383c7a921a0758dde32e940e42d 100644
|
| --- a/Source/core/dom/DocumentMarkerController.cpp
|
| +++ b/Source/core/dom/DocumentMarkerController.cpp
|
| @@ -31,6 +31,7 @@
|
| #include "core/dom/NodeTraversal.h"
|
| #include "core/dom/Range.h"
|
| #include "core/dom/RenderedDocumentMarker.h"
|
| +#include "core/dom/Text.h"
|
| #include "core/editing/TextIterator.h"
|
| #include "core/rendering/RenderObject.h"
|
|
|
| @@ -40,6 +41,20 @@
|
|
|
| namespace blink {
|
|
|
| +MarkerRemoverPredicate::MarkerRemoverPredicate(const Vector<String>& words)
|
| + : m_words(words)
|
| +{
|
| +}
|
| +
|
| +bool MarkerRemoverPredicate::operator()(const DocumentMarker& documentMarker,
|
| + const Text* textNode) const {
|
| + unsigned start = documentMarker.startOffset();
|
| + unsigned length = documentMarker.endOffset() - documentMarker.startOffset();
|
| +
|
| + String markerText = textNode->data().substring(start, length);
|
| + return m_words.contains(markerText);
|
| +}
|
| +
|
| namespace {
|
|
|
| DocumentMarker::MarkerTypeIndex MarkerTypeToMarkerIndex(DocumentMarker::MarkerType type)
|
| @@ -494,6 +509,25 @@ void DocumentMarkerController::removeMarkers(Node* node, DocumentMarker::MarkerT
|
| removeMarkersFromList(iterator, markerTypes);
|
| }
|
|
|
| +void DocumentMarkerController::removeMarkers(const MarkerRemoverPredicate& shouldRemoveMarker)
|
| +{
|
| + for (MarkerMap::iterator i = m_markers.begin(); i != m_markers.end(); ++i) {
|
| + MarkerLists* markers = i->value.get();
|
| + for (size_t markerListIndex = 0; markerListIndex < DocumentMarker::MarkerTypeIndexesCount; ++markerListIndex) {
|
| + OwnPtrWillBeMember<MarkerList>& list = (*markers)[markerListIndex];
|
| +
|
| + Vector<RenderedDocumentMarker *> markersToBeRemoved;
|
| + for (size_t j = 0; list.get() && j < list->size(); ++j) {
|
| + if (i->key->isTextNode() && shouldRemoveMarker(*list->at(j).get(), static_cast<const Text*>(i->key)))
|
| + markersToBeRemoved.append(list->at(j).get());
|
| + }
|
| +
|
| + for (size_t j = 0; j < markersToBeRemoved.size(); ++j)
|
| + list->remove(list->find(markersToBeRemoved[j]));
|
| + }
|
| + }
|
| +}
|
| +
|
| void DocumentMarkerController::removeMarkers(DocumentMarker::MarkerTypes markerTypes)
|
| {
|
| if (!possiblyHasMarkers(markerTypes))
|
|
|