| Index: Source/core/dom/DocumentMarkerController.cpp
|
| diff --git a/Source/core/dom/DocumentMarkerController.cpp b/Source/core/dom/DocumentMarkerController.cpp
|
| index 39f299ea703470aa76438caeaa31bf492bc59679..c710a8bcea2e4100e2d771fc2686c5d9d78ce49b 100644
|
| --- a/Source/core/dom/DocumentMarkerController.cpp
|
| +++ b/Source/core/dom/DocumentMarkerController.cpp
|
| @@ -147,9 +147,9 @@ void DocumentMarkerController::prepareForDestruction()
|
| clear();
|
| }
|
|
|
| -void DocumentMarkerController::removeMarkers(Range* range, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
|
| +void DocumentMarkerController::removeMarkers(TextIterator& markedText, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
|
| {
|
| - for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
|
| + for (; !markedText.atEnd(); markedText.advance()) {
|
| if (!possiblyHasMarkers(markerTypes))
|
| return;
|
| ASSERT(!m_markers.isEmpty());
|
| @@ -160,6 +160,18 @@ void DocumentMarkerController::removeMarkers(Range* range, DocumentMarker::Marke
|
| }
|
| }
|
|
|
| +void DocumentMarkerController::removeMarkers(Range* range, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
|
| +{
|
| + TextIterator markedText(range);
|
| + DocumentMarkerController::removeMarkers(markedText, markerTypes, shouldRemovePartiallyOverlappingMarker);
|
| +}
|
| +
|
| +void DocumentMarkerController::removeMarkers(const Position& start, const Position& end, DocumentMarker::MarkerTypes markerTypes, RemovePartiallyOverlappingMarkerOrNot shouldRemovePartiallyOverlappingMarker)
|
| +{
|
| + TextIterator markedText(start, end);
|
| + DocumentMarkerController::removeMarkers(markedText, markerTypes, shouldRemovePartiallyOverlappingMarker);
|
| +}
|
| +
|
| static bool startsFurther(const OwnPtrWillBeMember<RenderedDocumentMarker>& lhv, const DocumentMarker* rhv)
|
| {
|
| return lhv->startOffset() < rhv->startOffset();
|
|
|