Remove DocumentMarkerController::MarkersInRange()

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 303 matching lines @@
   void SwapAndVerifyMiddleChildConsistency(const char* const message,
                                            WebFrame* parent,
                                            WebFrame* new_child);
   void SwapAndVerifyLastChildConsistency(const char* const message,
                                          WebFrame* parent,
                                          WebFrame* new_child);
   void SwapAndVerifySubframeConsistency(const char* const message,
                                         WebFrame* parent,
                                         WebFrame* new_child);
 
+  int NumMarkersInRange(const Document* document,
+                        const EphemeralRange& range,
+                        DocumentMarker::MarkerTypes marker_types) {
+    Node* start_container = range.StartPosition().ComputeContainerNode();
+    unsigned start_offset = static_cast<unsigned>(
+        range.StartPosition().ComputeOffsetInContainerNode());
+
+    Node* end_container = range.EndPosition().ComputeContainerNode();
+    unsigned end_offset = static_cast<unsigned>(
+        range.EndPosition().ComputeOffsetInContainerNode());
+
+    int node_count = 0;
+    for (Node& node : range.Nodes()) {
+      for (DocumentMarker* marker :

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

Can we use std::count_if()[1]?

[1] http://en.cppreference.com/w/cpp/algorithm/count

+           document->Markers().MarkersFor(&node, marker_types)) {
+        if (node == start_container && marker->EndOffset() <= start_offset)
+          continue;
+        if (node == end_container && marker->StartOffset() >= end_offset)
+          continue;
+        ++node_count;
+      }
+    }
+
+    return node_count;
+  }
+
   std::string base_url_;
   std::string not_base_url_;
   std::string chrome_url_;
 };
 
 typedef bool TestParamRootLayerScrolling;
 class ParameterizedWebFrameTest
     : public ::testing::WithParamInterface<TestParamRootLayerScrolling>,
       private ScopedRootLayerScrollingForTest,
       public WebFrameTest {
@@ skipping 6206 matching lines @@
   const int kAllTextBeginOffset = 0;
   const int kAllTextLength = 11;
   frame->SelectRange(WebRange(kAllTextBeginOffset, kAllTextLength));
   EphemeralRange selection_range =
       frame->GetFrame()
           ->Selection()
           .ComputeVisibleSelectionInDOMTreeDeprecated()
           .ToNormalizedEphemeralRange();
 
   EXPECT_EQ(1, textcheck.NumberOfTimesChecked());
-  EXPECT_EQ(1U, document->Markers()
-                    .MarkersInRange(selection_range, DocumentMarker::kSpelling)
-                    .size());
+  EXPECT_EQ(1, NumMarkersInRange(document, selection_range,
+                                 DocumentMarker::kSpelling));
 
   frame->ReplaceMisspelledRange("welcome");
   EXPECT_EQ("_welcome_.",
             WebFrameContentDumper::DumpWebViewAsText(
                 web_view_helper.WebView(), std::numeric_limits<size_t>::max())
                 .Utf8());
 }
 
 TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers) {
   RegisterMockedHttpURLLoad("spell.html");
@@ skipping 26 matching lines @@
 
   const int kAllTextBeginOffset = 0;
   const int kAllTextLength = 11;
   frame->SelectRange(WebRange(kAllTextBeginOffset, kAllTextLength));
   EphemeralRange selection_range =
       frame->GetFrame()
           ->Selection()
           .ComputeVisibleSelectionInDOMTreeDeprecated()
           .ToNormalizedEphemeralRange();
 
-  EXPECT_EQ(0U, document->Markers()
-                    .MarkersInRange(selection_range, DocumentMarker::kSpelling)
-                    .size());
+  EXPECT_EQ(0, NumMarkersInRange(document, selection_range,
+                                 DocumentMarker::kSpelling));
 }
 
 static void GetSpellingMarkerOffsets(WebVector<unsigned>* offsets,
                                      const Document& document) {
   Vector<unsigned> result;
   const DocumentMarkerVector& document_markers = document.Markers().Markers();
   for (size_t i = 0; i < document_markers.size(); ++i)
     result.push_back(document_markers[i]->StartOffset());
   offsets->Assign(result);
 }
@@ skipping 5431 matching lines @@
 
   // Failing the original child frame navigation and trying to render fallback
   // content shouldn't crash. It should return NoLoadInProgress. This is so the
   // caller won't attempt to replace the correctly empty frame with an error
   // page.
   EXPECT_EQ(WebLocalFrame::NoLoadInProgress,
             child->MaybeRenderFallbackContent(WebURLError()));
 }
 
 }  // namespace blink