Remove DocumentMarkerController::MarkersInRange()

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

Index: third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
index 71a48a56cc62fbfd9098153f1efa18d809a453f9..390ea155cee6ba45703c2c2ddcf9ad02dc8f9a2e 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
+++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp
@@ -802,17 +802,44 @@ void SpellChecker::ReplaceMisspelledRange(const String& text) {
                                    .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 =
+      caret_range.StartPosition().ComputeContainerNode();
+  const unsigned caret_start_offset =
+      caret_range.StartPosition().ComputeOffsetInContainerNode();
+  Node* caret_end_container = caret_range.EndPosition().ComputeContainerNode();
+  const unsigned caret_end_offset =
+      caret_range.EndPosition().ComputeOffsetInContainerNode();
+
+  Node* found_marker_anchor_node = nullptr;
+  const DocumentMarker* found_marker = nullptr;
+  for (Node& node : caret_range.Nodes()) {

[Xiaocheng, 2017/05/10 22:54:22]

Since we do not plan to support the case where a misspelling spans multiple
nodes, there is no need to iterate over the nodes. Retrieving markers from only
|caret_start_container| suffices.

[rlanday, 2017/05/10 23:17:57]

I don't think that's correct; the misspelling could occur right at the beginning
of the node, in which case caret_start_container might not be anchored to the
text node that the DocumentMarker is anchored to. (We might have a similar
problem for misspellings occurring at the end of the node if we were to use
caret_end_container).

[Xiaocheng, 2017/05/10 23:23:42]

1. caret_range has been adjusted by ToNormalizedEphemeralRange, which should
have its start and end anchored at text nodes.

2. The old code doesn't work either if caret_range is not anchored directly at
the text node with the misspelling.

[rlanday, 2017/05/10 23:25:43]

Ah, OK, I'll change it

+    if (found_marker)
+      break;
+
+    const DocumentMarkerVector& markers_in_node =
+        GetFrame().GetDocument()->Markers().MarkersFor(
+            &node, DocumentMarker::MisspellingMarkers());
+    for (DocumentMarker* marker : markers_in_node) {
+      if (&node == caret_start_container &&
+          marker->EndOffset() <= caret_start_offset)
+        continue;
+      if (&node == caret_end_container &&
+          marker->StartOffset() >= caret_end_offset)
+        continue;
+
+      found_marker_anchor_node = &node;
+      found_marker = markers_in_node[0];
+      break;
+    }
+  }
+
+  if (!found_marker)
     return;
+
   EphemeralRange marker_range = EphemeralRange(
-      Position(caret_range.StartPosition().ComputeContainerNode(),

[Xiaocheng, 2017/05/10 22:54:22]

Note that the existing code doesn't work if the start and end container nodes
are different.

-               markers[0]->StartOffset()),
-      Position(caret_range.EndPosition().ComputeContainerNode(),
-               markers[0]->EndOffset()));
+      Position(found_marker_anchor_node, found_marker->StartOffset()),
+      Position(found_marker_anchor_node, found_marker->EndOffset()));
   if (marker_range.IsNull())
     return;