Don't ever split DocumentMarkers on remove

third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
@@ skipping 67 matching lines @@
                    unsigned start_offset,
                    int length,
                    Node* dst_node,
                    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 {

[Xiaocheng, 2017/04/10 21:22:10]

Please also remove this enum.

     kDoNotRemovePartiallyOverlappingMarker,
     kRemovePartiallyOverlappingMarker
   };
-  void RemoveMarkers(const EphemeralRange&,
-                     DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers(),
-                     RemovePartiallyOverlappingMarkerOrNot =
-                         kDoNotRemovePartiallyOverlappingMarker);
-  void RemoveMarkers(Node*,
-                     unsigned start_offset,
-                     int length,
-                     DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers(),
-                     RemovePartiallyOverlappingMarkerOrNot =
-                         kDoNotRemovePartiallyOverlappingMarker);
-
+  void RemoveMarkers(
+      const EphemeralRange&,
+      DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
+  void RemoveMarkers(
+      Node*,
+      unsigned start_offset,
+      int length,
+      DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void RemoveMarkers(
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void RemoveMarkers(
       Node*,
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void RemoveMarkers(const MarkerRemoverPredicate& should_remove_marker);
   void RepaintMarkers(
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   // Returns true if markers within a range are found.
   bool SetMarkersActive(const EphemeralRange&, bool);
@@ skipping 31 matching lines @@
  private:
   void AddMarker(Node*, const DocumentMarker&);
 
   using MarkerList = HeapVector<Member<RenderedDocumentMarker>>;
   using MarkerLists =
       HeapVector<Member<MarkerList>, DocumentMarker::kMarkerTypeIndexesCount>;
   using MarkerMap = HeapHashMap<WeakMember<const Node>, Member<MarkerLists>>;
   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 markers_;
   // Provide a quick way to determine whether a particular marker type is absent
   // without going through the map.
   DocumentMarker::MarkerTypes possibly_existing_marker_types_;
   const Member<const Document> document_;
 };
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController*);
 #endif
 
 #endif  // DocumentMarkerController_h