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

Unified Diff: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h

Issue 2806683002: Don't ever split DocumentMarkers on remove (Closed)
Patch Set: Leave partial markers in place for non-splitting case, preserve endpoints for splitting case Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698