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())
+
+  // We don't currently support the case where a misspelling spans multiple
+  // nodes, so we assume this is the same as caret_end_container
+  Node* caret_start_container =

[Xiaocheng, 2017/05/10 23:55:15]

We should return if |caret_end_container != caret_start_container|

+      caret_range.StartPosition().ComputeContainerNode();
+  const unsigned caret_start_offset =
+      caret_range.StartPosition().ComputeOffsetInContainerNode();
+  const unsigned caret_end_offset =
+      caret_range.EndPosition().ComputeOffsetInContainerNode();
+
+  const DocumentMarker* found_marker = nullptr;
+  const DocumentMarkerVector& markers_in_node =

[Xiaocheng, 2017/05/10 23:55:15]

This chunk of code is still duplicated with that in ContextMenuClientImpl.

That's why I suggested MarkersInRange(node, start_offset, end_offset).

Or maybe std::find_if + lambda can make the code duplication at an acceptable
level.

Anyway, this is not that important now since the ill-formed API is gone.

[yosin_UTC9, 2017/05/11 01:03:41]

I prefer std::find_if() to reduce # of API in DMC.
Because of the predicate is simple and DocumentMarkerVector is at most have
number of
DocumentMakerTypes, which is less than 10 at this time.

+      GetFrame().GetDocument()->Markers().MarkersFor(
+          caret_start_container, DocumentMarker::MisspellingMarkers());
+  for (DocumentMarker* marker : markers_in_node) {
+    if (marker->EndOffset() <= caret_start_offset)
+      continue;
+    if (marker->StartOffset() >= caret_end_offset)
+      continue;
+
+    found_marker = marker;
+    break;
+  }
+
+  if (!found_marker)
     return;
+
   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