[DMC #1.2] Add DocumentMarkerListEditor::MoveMarkers()

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 304 matching lines @@
   for (size_t marker_list_index = 0; marker_list_index < src_markers->size();
        ++marker_list_index) {
     MarkerList* src_list = src_markers->at(marker_list_index);
     if (!src_list)
       continue;
 
     if (!dst_markers->at(marker_list_index))
       dst_markers->at(marker_list_index) = new MarkerList;
     MarkerList* dst_list = dst_markers->at(marker_list_index);
 
-    unsigned end_offset = length - 1;
-    MarkerList::iterator it;
-    for (it = src_list->begin(); it != src_list->end(); ++it) {
-      DocumentMarker* marker = it->Get();
-
-      // stop if we are now past the specified range
-      if (marker->StartOffset() > end_offset)
-        break;
-
-      // pin the marker to the specified range
+    if (DocumentMarkerListEditor::MoveMarkers(src_list, length, dst_list))
       doc_dirty = true;
-      if (marker->EndOffset() > end_offset)
-        marker->SetEndOffset(end_offset);
-
-      DocumentMarkerListEditor::AddMarker(dst_list, marker);
-    }
-
-    // Remove the range of markers that were moved to dst_node
-    src_list->erase(0, it - src_list->begin());
   }
 
   // repaint the affected node
   if (doc_dirty && dst_node->GetLayoutObject()) {
     dst_node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
   }
 }
 
+// TODO(rlanday): move DocumentMarkerListEditor into its own .h/.cpp files
+bool DocumentMarkerListEditor::MoveMarkers(MarkerList* src_list,
+                                           int length,
+                                           MarkerList* dst_list) {
+  DCHECK_GT(length, 0);
+  bool doc_dirty = false;
+  unsigned end_offset = length - 1;

[yosin_UTC9, 2017/04/20 01:26:56]

nit: s/unsigned/const unsigned/

+  MarkerList::iterator it;
+  for (it = src_list->begin(); it != src_list->end(); ++it) {
+    DocumentMarker* marker = it->Get();
+
+    // stop if we are now past the specified range
+    if (marker->StartOffset() > end_offset)
+      break;
+
+    // pin the marker to the specified range
+    doc_dirty = true;
+    if (marker->EndOffset() > end_offset)
+      marker->SetEndOffset(end_offset);
+
+    DocumentMarkerListEditor::AddMarker(dst_list, marker);
+  }
+
+  // Remove the range of markers that were moved to dst_node
+  src_list->erase(0, it - src_list->begin());
+
+  return doc_dirty;
+}
+
 void DocumentMarkerController::RemoveMarkers(
     Node* node,
     unsigned start_offset,
     int length,
     DocumentMarker::MarkerTypes marker_types) {
   if (length <= 0)
     return;
 
   if (!PossiblyHasMarkers(marker_types))
     return;
@@ skipping 522 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif