Don't ever split DocumentMarkers on remove

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

 /*
  * 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 128 matching lines @@
                              markedText.endOffsetInCurrentContainer(),
                              underlineColor, thick, backgroundColor));
 }
 
 void DocumentMarkerController::prepareForDestruction() {
   clear();
 }
 
 void DocumentMarkerController::removeMarkers(
     TextIterator& markedText,
-    DocumentMarker::MarkerTypes markerTypes,
-    RemovePartiallyOverlappingMarkerOrNot
-        shouldRemovePartiallyOverlappingMarker) {
+    DocumentMarker::MarkerTypes markerTypes) {
   for (; !markedText.atEnd(); markedText.advance()) {
     if (!possiblyHasMarkers(markerTypes))
       return;
     DCHECK(!m_markers.isEmpty());
 
     int startOffset = markedText.startOffsetInCurrentContainer();
     int endOffset = markedText.endOffsetInCurrentContainer();
     removeMarkers(markedText.currentContainer(), startOffset,
-                  endOffset - startOffset, markerTypes,
-                  shouldRemovePartiallyOverlappingMarker);
+                  endOffset - startOffset, markerTypes);
   }
 }
 
 void DocumentMarkerController::removeMarkers(
     const EphemeralRange& range,
-    DocumentMarker::MarkerTypes markerTypes,
-    RemovePartiallyOverlappingMarkerOrNot
-        shouldRemovePartiallyOverlappingMarker) {
+    DocumentMarker::MarkerTypes markerTypes) {
   DCHECK(!m_document->needsLayoutTreeUpdate());
 
   TextIterator markedText(range.startPosition(), range.endPosition());
-  DocumentMarkerController::removeMarkers(
-      markedText, markerTypes, shouldRemovePartiallyOverlappingMarker);
+  DocumentMarkerController::removeMarkers(markedText, markerTypes);
 }
 
 static bool startsFurther(const Member<RenderedDocumentMarker>& lhv,
                           const DocumentMarker* rhv) {
   return lhv->startOffset() < rhv->startOffset();
 }
 
 static bool endsBefore(size_t startOffset,
                        const Member<RenderedDocumentMarker>& rhv) {
   return startOffset < rhv->endOffset();
@@ skipping 151 matching lines @@
   if (docDirty && dstNode->layoutObject()) {
     dstNode->layoutObject()->setShouldDoFullPaintInvalidation(
         PaintInvalidationDocumentMarkerChange);
   }
 }
 
 void DocumentMarkerController::removeMarkers(
     Node* node,
     unsigned startOffset,
     int length,
-    DocumentMarker::MarkerTypes markerTypes,
-    RemovePartiallyOverlappingMarkerOrNot
-        shouldRemovePartiallyOverlappingMarker) {
+    DocumentMarker::MarkerTypes markerTypes) {
   if (length <= 0)
     return;
 
   if (!possiblyHasMarkers(markerTypes))
     return;
   DCHECK(!(m_markers.isEmpty()));
 
   MarkerLists* markers = m_markers.at(node);
   if (!markers)
     return;
@@ skipping 16 matching lines @@
     MarkerList::iterator startPos =
         std::upper_bound(list->begin(), list->end(), startOffset, endsBefore);
     for (MarkerList::iterator i = startPos; i != list->end();) {
       DocumentMarker marker(*i->get());
 
       // markers are returned in order, so stop if we are now past the specified
       // range
       if (marker.startOffset() >= endOffset)
         break;
 
-      // at this point we know that marker and target intersect in some way
+      list->erase(i - list->begin());
       docDirty = true;
-
-      // pitch the old marker
-      list->erase(i - list->begin());
-
-      if (shouldRemovePartiallyOverlappingMarker) {
-        // Stop here. Don't add resulting slices back.
-        continue;
-      }
-
-      // add either of the resulting slices that are left after removing target
-      if (startOffset > marker.startOffset()) {
-        DocumentMarker newLeft = marker;
-        newLeft.setEndOffset(startOffset);
-        size_t insertIndex = i - list->begin();
-        list->insert(insertIndex, RenderedDocumentMarker::create(newLeft));
-        // Move to the marker after the inserted one.
-        i = list->begin() + insertIndex + 1;
-      }
-      if (marker.endOffset() > endOffset) {
-        DocumentMarker newRight = marker;
-        newRight.setStartOffset(endOffset);
-        size_t insertIndex = i - list->begin();
-        list->insert(insertIndex, RenderedDocumentMarker::create(newRight));
-        // Move to the marker after the inserted one.
-        i = list->begin() + insertIndex + 1;
-      }
     }
 
     if (list->isEmpty()) {
       list.clear();
       ++emptyListsCount;
     }
   }
 
   if (emptyListsCount == DocumentMarker::MarkerTypeIndexesCount) {
     m_markers.erase(node);
@@ skipping 399 matching lines @@
   LOG(INFO) << m_markers.size() << " nodes have markers:\n"
             << builder.toString().utf8().data();
 }
 #endif
 
 // SynchronousMutationObserver
 void DocumentMarkerController::didUpdateCharacterData(CharacterData* node,
                                                       unsigned offset,
                                                       unsigned oldLength,
                                                       unsigned newLength) {
-  // If we're doing a pure remove operation, remove the markers in the range

[Xiaocheng, 2017/04/08 00:23:36]

I see.

But this change fits better in the previous patch.

-  // being removed (markers containing, but larger than, the range, will be
-  // split)
-  if (newLength == 0)
-    removeMarkers(node, offset, oldLength);
-
   if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
     return;
   DCHECK(!m_markers.isEmpty());
 
   MarkerLists* markers = m_markers.at(node);
   if (!markers)
     return;
 
   bool didShiftMarker = false;
   for (MarkerList* list : *markers) {
@@ skipping 30 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->showMarkers();
 }
 #endif