Remove DocumentMarkerController::MarkersInRange()

third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 784 matching lines @@
   }
 }
 
 void SpellChecker::ReplaceMisspelledRange(const String& text) {
   EphemeralRange caret_range = GetFrame()
                                    .Selection()
                                    .ComputeVisibleSelectionInDOMTree()
                                    .ToNormalizedEphemeralRange();
   if (caret_range.IsNull())
     return;
-  DocumentMarkerVector markers =
-      GetFrame().GetDocument()->Markers().MarkersInRange(
-          caret_range, DocumentMarker::MisspellingMarkers());
-  if (markers.size() < 1 ||
-      markers[0]->StartOffset() >= markers[0]->EndOffset())
+
+  Node* caret_start_container =

[yosin_UTC9, 2017/05/11 04:36:02]

nit: s/Node*/Node* const/

+      caret_range.StartPosition().ComputeContainerNode();
+  Node* caret_end_container = caret_range.EndPosition().ComputeContainerNode();

[yosin_UTC9, 2017/05/11 04:36:02]

nit: s/Node*/Node* const/

+
+  // We don't currently support the case where a misspelling spans multiple
+  // nodes
+  if (caret_start_container != caret_end_container)
     return;
+
+  const unsigned caret_start_offset =
+      caret_range.StartPosition().ComputeOffsetInContainerNode();
+  const unsigned caret_end_offset =
+      caret_range.EndPosition().ComputeOffsetInContainerNode();
+
+  const DocumentMarkerVector& markers_in_node =
+      GetFrame().GetDocument()->Markers().MarkersFor(
+          caret_start_container, DocumentMarker::MisspellingMarkers());
+
+  const auto marker_it =
+      std::find_if(markers_in_node.begin(), markers_in_node.end(),
+                   [=](const DocumentMarker* marker) {
+                     return marker->StartOffset() < caret_end_offset &&
+                            marker->EndOffset() > caret_start_offset;
+                   });
+  if (marker_it == markers_in_node.end())
+    return;
+
+  const DocumentMarker* found_marker = *marker_it;
   EphemeralRange marker_range = EphemeralRange(
-      Position(caret_range.StartPosition().ComputeContainerNode(),
-               markers[0]->StartOffset()),
-      Position(caret_range.EndPosition().ComputeContainerNode(),
-               markers[0]->EndOffset()));
+      Position(caret_start_container, found_marker->StartOffset()),
+      Position(caret_start_container, found_marker->EndOffset()));
   if (marker_range.IsNull())
     return;
 
   GetFrame().Selection().SetSelection(
       SelectionInDOMTree::Builder().SetBaseAndExtent(marker_range).Build());
 
   Document& current_document = *GetFrame().GetDocument();
 
   // Dispatch 'beforeinput'.
   Element* const target = GetFrame().GetEditor().FindEventTargetFromSelection();
@@ skipping 372 matching lines @@
       if (!input.IsFocusedElementInDocument())
         return false;
     }
   }
   HTMLElement* element =
       Traversal<HTMLElement>::FirstAncestorOrSelf(*position.AnchorNode());
   return element && element->IsSpellCheckingEnabled();
 }
 
 }  // namespace blink