Add DocumentMarker::clone()

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 363 matching lines @@
         list.clear();
       ++emptyListsCount;
       continue;
     }
     if (!markerTypes.contains((*list->begin())->type()))
       continue;
     unsigned endOffset = startOffset + length;
     MarkerList::iterator startPos =
         std::upper_bound(list->begin(), list->end(), startOffset, endsBefore);
     for (MarkerList::iterator i = startPos; i != list->end();) {
-      DocumentMarker marker(*i->get());
+      DocumentMarker* marker = (*i)->clone();

[Xiaocheng, 2017/03/30 02:20:28]

No need to change this part. |marker| should reference the existing marker.

Note that the reference is still valid after calling |list->erase()|, due to
Oilpan.

 
       // markers are returned in order, so stop if we are now past the specified
       // range
-      if (marker.startOffset() >= endOffset)
+      if (marker->startOffset() >= endOffset)
         break;
 
       // at this point we know that marker and target intersect in some way
       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);
+      if (startOffset > marker->startOffset()) {
+        DocumentMarker* newLeft = marker->clone();
+        newLeft->setEndOffset(startOffset);
         size_t insertIndex = i - list->begin();
-        list->insert(insertIndex, RenderedDocumentMarker::create(newLeft));
+        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);
+      if (marker->endOffset() > endOffset) {
+        DocumentMarker* newRight = marker->clone();
+        newRight->setStartOffset(endOffset);
         size_t insertIndex = i - list->begin();
-        list->insert(insertIndex, RenderedDocumentMarker::create(newRight));
+        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;
     }
   }
@@ skipping 457 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->showMarkers();
 }
 #endif