Clean up DocumentMarkerController::MarkersFor()

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 365 matching lines @@
       std::find_if(markers.begin(), markers.end(), [=](DocumentMarker* marker) {
         return marker->StartOffset() < offset && offset < marker->EndOffset();
       });
   return it == markers.end() ? nullptr : *it;
 }
 
 DocumentMarkerVector DocumentMarkerController::MarkersFor(
     Node* node,
     DocumentMarker::MarkerTypes marker_types) {
   DocumentMarkerVector result;
+  if (!PossiblyHasMarkers(marker_types))
+    return result;
 
   MarkerLists* markers = markers_.at(node);
   if (!markers)
     return result;
 
-  for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
+  for (DocumentMarker::MarkerType type : marker_types) {
     DocumentMarkerList* const list = ListForType(markers, type);
-    if (!list || list->IsEmpty() || !marker_types.Contains(type))
+    if (!list || list->IsEmpty())
       continue;
 
     result.AppendVector(list->GetMarkers());
   }
 
   std::sort(result.begin(), result.end(),
             [](const Member<DocumentMarker>& marker1,
                const Member<DocumentMarker>& marker2) {
               return marker1->StartOffset() < marker2->StartOffset();
             });
@@ skipping 329 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif