Remove DocumentMarkerController::MarkersInRange()

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/InputMethodController.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
@@ skipping 14 matching lines @@
 class InputMethodControllerTest : public ::testing::Test {
  protected:
   InputMethodController& Controller() {
     return GetFrame().GetInputMethodController();
   }
   Document& GetDocument() const { return *document_; }
   LocalFrame& GetFrame() const { return dummy_page_holder_->GetFrame(); }
   Element* InsertHTMLElement(const char* element_code, const char* element_id);
   void CreateHTMLWithCompositionInputEventListeners();
   void CreateHTMLWithCompositionEndEventListener(const SelectionType);
+  int NumMarkersInRange(const EphemeralRange&, DocumentMarker::MarkerTypes);
 
  private:
   void SetUp() override;
 
   std::unique_ptr<DummyPageHolder> dummy_page_holder_;
   Persistent<Document> document_;
 };
 
 void InputMethodControllerTest::SetUp() {
   dummy_page_holder_ = DummyPageHolder::Create(IntSize(800, 600));
@@ skipping 65 matching lines @@
           "});");
       break;
     default:
       NOTREACHED();
   }
   GetDocument().body()->AppendChild(script);
   GetDocument().View()->UpdateAllLifecyclePhases();
   editable->focus();
 }
 
+int InputMethodControllerTest::NumMarkersInRange(
+    const EphemeralRange& range,
+    DocumentMarker::MarkerTypes marker_types) {
+  int node_count = 0;
+  for (Node& node : range.Nodes()) {
+    node_count +=
+        GetDocument().Markers().MarkersFor(&node, marker_types).size();
+  }
+  return node_count;
+}
+
 TEST_F(InputMethodControllerTest, BackspaceFromEndOfInput) {
   HTMLInputElement* input =
       toHTMLInputElement(InsertHTMLElement("<input id='sample'>", "sample"));
 
   input->setValue("fooX");
   GetDocument().UpdateStyleAndLayout();
   Controller().SetEditableSelectionOffsets(PlainTextRange(4, 4));
   EXPECT_STREQ("fooX", input->value().Utf8().data());
   Controller().ExtendSelectionAndDelete(0, 0);
   EXPECT_STREQ("fooX", input->value().Utf8().data());
@@ skipping 1271 matching lines @@
   Controller().FinishComposingText(InputMethodController::kKeepSelection);
   GetFrame().GetEditor().InsertLineBreak();
 
   Controller().SetCompositionFromExistingText(underlines, 8, 8);
 
   underlines.push_back(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
   Controller().SetComposition(String("world"), underlines, 0, 0);
   ASSERT_EQ(1u, GetDocument().Markers().Markers().size());
 
   // Verify composition underline shows up on the second line, not the first
-  ASSERT_EQ(0u, GetDocument()
-                    .Markers()
-                    .MarkersInRange(PlainTextRange(0, 5).CreateRange(*div),
-                                    DocumentMarker::AllMarkers())
-                    .size());
-  ASSERT_EQ(1u, GetDocument()
-                    .Markers()
-                    .MarkersInRange(PlainTextRange(6, 11).CreateRange(*div),
-                                    DocumentMarker::AllMarkers())
-                    .size());
+  ASSERT_EQ(0, NumMarkersInRange(PlainTextRange(0, 5).CreateRange(*div),
+                                 DocumentMarker::AllMarkers()));
+  ASSERT_EQ(1, NumMarkersInRange(PlainTextRange(6, 11).CreateRange(*div),
+                                 DocumentMarker::AllMarkers()));
 
   // Verify marker has correct start/end offsets (measured from the beginning
   // of the node, which is the beginning of the line)
   EXPECT_EQ(0u, GetDocument().Markers().Markers()[0]->StartOffset());
   EXPECT_EQ(5u, GetDocument().Markers().Markers()[0]->EndOffset());
 }
 
 TEST_F(InputMethodControllerTest, SelectionWhenFocusChangeFinishesComposition) {
   GetDocument().GetSettings()->SetScriptEnabled(true);
   Element* editable =
@@ skipping 541 matching lines @@
   // Set selection before BODY(editable).
   GetFrame().Selection().SetSelection(
       SelectionInDOMTree::Builder()
           .Collapse(Position(GetDocument().documentElement(), 0))
           .Build());
 
   EXPECT_EQ(kWebTextInputTypeContentEditable, Controller().TextInputType());
 }
 
 }  // namespace blink