Remove DocumentMarkerController::MarkersInRange()

third_party/WebKit/Source/core/editing/SelectionController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 501 matching lines @@
   Node* inner_node = result.InnerNode();
   VisibleSelectionInFlatTree new_selection;
 
   if (!inner_node || !inner_node->GetLayoutObject())
     return;
 
   const VisiblePositionInFlatTree& pos = VisiblePositionOfHitTestResult(result);
   if (pos.IsNotNull()) {
     const PositionInFlatTree& marker_position =
         pos.DeepEquivalent().ParentAnchoredEquivalent();
-    DocumentMarkerVector markers =
-        inner_node->GetDocument().Markers().MarkersInRange(
-            EphemeralRange(ToPositionInDOMTree(marker_position)),
+    Optional<DocumentMarker*> marker =

[Xiaocheng, 2017/05/11 18:25:20]

Please change type of |marker| to |const DocumentMarker* const|

+        inner_node->GetDocument().Markers().MarkerAtPosition(
+            ToPositionInDOMTree(marker_position),
             DocumentMarker::MisspellingMarkers());
-    if (markers.size() == 1) {
+    if (marker.has_value()) {
       Node* container_node = marker_position.ComputeContainerNode();
-      const PositionInFlatTree start(container_node, markers[0]->StartOffset());
-      const PositionInFlatTree end(container_node, markers[0]->EndOffset());
+      const PositionInFlatTree start(container_node,
+                                     marker.value()->StartOffset());
+      const PositionInFlatTree end(container_node, marker.value()->EndOffset());
       new_selection = CreateVisibleSelection(
           SelectionInFlatTree::Builder().Collapse(start).Extend(end).Build());
     }
   }
 
   if (append_trailing_whitespace == AppendTrailingWhitespace::kShouldAppend)
     new_selection.AppendTrailingWhitespace();
 
   UpdateSelectionForMouseDownDispatchingSelectStart(
       inner_node,
@@ skipping 471 matching lines @@
 }
 
 static bool HitTestResultIsMisspelled(const HitTestResult& result) {
   Node* inner_node = result.InnerNode();
   if (!inner_node || !inner_node->GetLayoutObject())
     return false;
   VisiblePosition pos = CreateVisiblePosition(
       inner_node->GetLayoutObject()->PositionForPoint(result.LocalPoint()));
   if (pos.IsNull())
     return false;
-  return inner_node->GetDocument()
-             .Markers()
-             .MarkersInRange(
-                 EphemeralRange(
-                     pos.DeepEquivalent().ParentAnchoredEquivalent()),
-                 DocumentMarker::MisspellingMarkers())
-             .size() > 0;
+  const Position& marker_position =
+      pos.DeepEquivalent().ParentAnchoredEquivalent();
+  return inner_node->GetDocument().Markers().MarkerAtPosition(
+      marker_position, DocumentMarker::MisspellingMarkers());
 }
 
 void SelectionController::SendContextMenuEvent(
     const MouseEventWithHitTestResults& mev,
     const LayoutPoint& position) {
   if (!Selection().IsAvailable())
     return;
   if (Selection().Contains(position) || mev.GetScrollbar() ||
       // FIXME: In the editable case, word selection sometimes selects content
       // that isn't underneath the mouse.
@@ skipping 96 matching lines @@
 
 bool IsExtendingSelection(const MouseEventWithHitTestResults& event) {
   bool is_mouse_down_on_link_or_image =
       event.IsOverLink() || event.GetHitTestResult().GetImage();
   return (event.Event().GetModifiers() & WebInputEvent::Modifiers::kShiftKey) !=
              0 &&
          !is_mouse_down_on_link_or_image;
 }
 
 }  // namespace blink