[DMC #1.1] Refactor DocumentMarkerController::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 278 matching lines @@
 void DocumentMarkerController::MoveMarkers(Node* src_node,
                                            int length,
                                            Node* dst_node) {
   if (length <= 0)
     return;
 
   if (!PossiblyHasMarkers(DocumentMarker::AllMarkers()))
     return;
   DCHECK(!markers_.IsEmpty());
 
-  MarkerLists* markers = markers_.at(src_node);
-  if (!markers)
+  MarkerLists* src_markers = markers_.at(src_node);
+  if (!src_markers)
     return;
 
+  if (!markers_.Contains(dst_node)) {
+    markers_.insert(dst_node,
+                    new MarkerLists(DocumentMarker::kMarkerTypeIndexesCount));
+  }
+  MarkerLists* dst_markers = markers_.at(dst_node);
+
   bool doc_dirty = false;
-  for (Member<MarkerList> list : *markers) {
-    if (!list)
+  for (size_t marker_list_index = 0; marker_list_index < src_markers->size();
+       marker_list_index++) {

[Xiaocheng, 2017/04/17 21:37:45]

nit: ++marker_list_index

Google coding style prefers prefix increment.

+    MarkerList* src_list = src_markers->at(marker_list_index);
+    if (!src_list)
       continue;
 
+    if (!dst_markers->at(marker_list_index)) {

[Xiaocheng, 2017/04/17 21:37:45]

nit: no need to have extra braces

+      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 = list->begin(); it != list->end(); ++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);
 
-      AddMarker(dst_node, *marker);
+      DocumentMarkerListEditor::AddMarker(dst_list, marker);
     }
 
-    // Remove the range of markers that were moved to dstNode
-    list->erase(0, it - list->begin());
+    // 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);
   }
 }
 
 void DocumentMarkerController::RemoveMarkers(
@@ skipping 532 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif