[DMC #3] Prepare DocumentMarkerController for using different DocumentMarkerList impls

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 47 matching lines @@
     case DocumentMarker::kTextMatch:
       return DocumentMarker::kTextMatchMarkerIndex;
     case DocumentMarker::kComposition:
       return DocumentMarker::kCompositionMarkerIndex;
   }
 
   NOTREACHED();
   return DocumentMarker::kSpellingMarkerIndex;
 }
 
+DocumentMarkerList* CreateListForType(DocumentMarker::MarkerType type) {
+  // All MarkerTypes use GenericDocumentMarkerListImpl for now. Eventually we
+  // will use different marker list classes for different MarkerTypes.
+  return new GenericDocumentMarkerListImpl();
+}
+
 }  // namespace
 
 Member<DocumentMarkerList>& DocumentMarkerController::ListForType(
     MarkerLists* marker_lists,
     DocumentMarker::MarkerType type) {
   const size_t marker_list_index = MarkerTypeToMarkerIndex(type);
   return (*marker_lists)[marker_list_index];
 }
 
 inline bool DocumentMarkerController::PossiblyHasMarkers(
@@ skipping 121 matching lines @@
   possibly_existing_marker_types_.Add(new_marker->GetType());
 
   Member<MarkerLists>& markers =
       markers_.insert(node, nullptr).stored_value->value;
   if (!markers) {
     markers = new MarkerLists;
     markers->Grow(DocumentMarker::kMarkerTypeIndexesCount);
   }
 
   const DocumentMarker::MarkerType new_marker_type = new_marker->GetType();
-  if (!ListForType(markers, new_marker_type)) {
-    // TODO(rlanday): add method for deciding what type of list to create based
-    // on the MarkerType
-    ListForType(markers, new_marker_type) = new GenericDocumentMarkerListImpl;
-  }
+  if (!ListForType(markers, new_marker_type))
+    ListForType(markers, new_marker_type) = CreateListForType(new_marker_type);
 
   DocumentMarkerList* const list = ListForType(markers, new_marker_type);
   list->Add(new_marker);
 
   // repaint the affected node
   if (node->GetLayoutObject()) {
     node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
   }
 }
@@ skipping 19 matching lines @@
                     new MarkerLists(DocumentMarker::kMarkerTypeIndexesCount));
   }
   MarkerLists* dst_markers = markers_.at(dst_node);
 
   bool doc_dirty = false;
   for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
     DocumentMarkerList* const src_list = ListForType(src_markers, type);
     if (!src_list)
       continue;
 
-    if (!ListForType(dst_markers, type)) {
-      // TODO(rlanday): add method for deciding what type of list to create
-      // based on the MarkerType
-      ListForType(dst_markers, type) = new GenericDocumentMarkerListImpl;
-    }
+    if (!ListForType(dst_markers, type))
+      ListForType(dst_markers, type) = CreateListForType(type);
 
     DocumentMarkerList* const dst_list = ListForType(dst_markers, type);
     if (src_list->MoveMarkers(length, dst_list))
       doc_dirty = true;
   }
 
   // repaint the affected node
   if (doc_dirty && dst_node->GetLayoutObject()) {
     dst_node->GetLayoutObject()->SetShouldDoFullPaintInvalidation(
         kPaintInvalidationDocumentMarkerChange);
@@ skipping 473 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif