| Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
|
| diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
|
| index cf78a0aca926b76016eb553503d99a18649460b9..f555a1196bd50719ec70872c5dc3d930f8d2c9b4 100644
|
| --- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
|
| +++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h
|
| @@ -81,25 +81,14 @@ class CORE_EXPORT DocumentMarkerController final
|
| int delta);
|
|
|
| void prepareForDestruction();
|
| - // When a marker partially overlaps with range, if
|
| - // removePartiallyOverlappingMarkers is true, we completely remove the marker.
|
| - // If the argument is false, we will adjust the span of the marker so that it
|
| - // retains the portion that is outside of the range.
|
| - enum RemovePartiallyOverlappingMarkerOrNot {
|
| - DoNotRemovePartiallyOverlappingMarker,
|
| - RemovePartiallyOverlappingMarker
|
| - };
|
| - void removeMarkers(const EphemeralRange&,
|
| - DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers(),
|
| - RemovePartiallyOverlappingMarkerOrNot =
|
| - DoNotRemovePartiallyOverlappingMarker);
|
| - void removeMarkers(Node*,
|
| - unsigned startOffset,
|
| - int length,
|
| - DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers(),
|
| - RemovePartiallyOverlappingMarkerOrNot =
|
| - DoNotRemovePartiallyOverlappingMarker);
|
| -
|
| + void removeMarkers(
|
| + const EphemeralRange&,
|
| + DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
|
| + void removeMarkers(
|
| + Node*,
|
| + unsigned startOffset,
|
| + int length,
|
| + DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
|
| void removeMarkers(
|
| DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
|
| void removeMarkers(
|
| @@ -148,9 +137,7 @@ class CORE_EXPORT DocumentMarkerController final
|
| void mergeOverlapping(MarkerList*, RenderedDocumentMarker*);
|
| bool possiblyHasMarkers(DocumentMarker::MarkerTypes);
|
| void removeMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);
|
| - void removeMarkers(TextIterator&,
|
| - DocumentMarker::MarkerTypes,
|
| - RemovePartiallyOverlappingMarkerOrNot);
|
| + void removeMarkers(TextIterator&, DocumentMarker::MarkerTypes);
|
|
|
| MarkerMap m_markers;
|
| // Provide a quick way to determine whether a particular marker type is absent
|
|
|