Index: Source/core/dom/DocumentMarkerController.cpp |
diff --git a/Source/core/dom/DocumentMarkerController.cpp b/Source/core/dom/DocumentMarkerController.cpp |
index 5a7cc9b47afb89e7f4f28bc2d60120995ec16109..565a0c534ae4c47790a69fe513ec1e45ede515de 100644 |
--- a/Source/core/dom/DocumentMarkerController.cpp |
+++ b/Source/core/dom/DocumentMarkerController.cpp |
@@ -29,7 +29,6 @@ |
#include "core/dom/Node.h" |
#include "core/dom/NodeTraversal.h" |
-#include "core/dom/Range.h" |
#include "core/dom/RenderedDocumentMarker.h" |
#include "core/editing/TextIterator.h" |
#include "core/rendering/RenderObject.h" |
@@ -494,6 +493,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]; |
dcheng
2014/08/05 20:30:38
It looks a little weird to have a stack reference
|
+ |
+ Vector<RenderedDocumentMarker *> markersToBeRemoved; |
+ for (size_t j = 0; list.get() && j < list->size(); ++j) { |
+ if (shouldRemoveMarker(*list->at(j).get(), 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)) |