Refactor TextFinder::scopeStringMatches().

third_party/WebKit/Source/web/tests/TextFinderTest.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 "web/TextFinder.h"
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Document.h"
 #include "core/dom/NodeList.h"
 #include "core/dom/Range.h"
@@ skipping 290 matching lines @@
   document().body()->setInnerHTML("XXXXFindMeYYYYfindmeZZZZ");
   document().updateStyleAndLayout();
 
   Node* textNode = document().body()->firstChild();
 
   int identifier = 0;
   WebString searchText(String("FindMe"));
   WebFindOptions findOptions;  // Default.
 
   textFinder().resetMatchCount();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   EXPECT_EQ(2, textFinder().totalMatchCount());
   WebVector<WebFloatRect> matchRects;
   textFinder().findMatchRects(matchRects);
   ASSERT_EQ(2u, matchRects.size());
   EXPECT_EQ(findInPageRect(textNode, 4, textNode, 10), matchRects[0]);
   EXPECT_EQ(findInPageRect(textNode, 14, textNode, 20), matchRects[1]);
 }
 
+TEST_F(TextFinderTest, ScopeTextMatchesRepeated) {
+  document().body()->setInnerHTML("XXXXFindMeYYYYfindmeZZZZ");
+  document().updateStyleAndLayout();
+
+  Node* textNode = document().body()->firstChild();
+
+  int identifier = 0;
+  WebString searchText1(String("XFindMe"));
+  WebString searchText2(String("FindMe"));
+  WebFindOptions findOptions;  // Default.
+
+  textFinder().resetMatchCount();
+  textFinder().startScopingStringMatches(identifier, searchText1, findOptions);
+  textFinder().startScopingStringMatches(identifier, searchText2, findOptions);
+  while (textFinder().scopingInProgress())
+    runPendingTasks();
+
+  // Only searchText2 should be highlighted.
+  EXPECT_EQ(2, textFinder().totalMatchCount());
+  WebVector<WebFloatRect> matchRects;
+  textFinder().findMatchRects(matchRects);
+  ASSERT_EQ(2u, matchRects.size());
+  EXPECT_EQ(findInPageRect(textNode, 4, textNode, 10), matchRects[0]);
+  EXPECT_EQ(findInPageRect(textNode, 14, textNode, 20), matchRects[1]);
+}
+
 TEST_F(TextFinderTest, ScopeTextMatchesWithShadowDOM) {
   document().body()->setInnerHTML("<b>FOO</b><i>foo</i>");
   ShadowRoot* shadowRoot = document().body()->createShadowRootInternal(
       ShadowRootType::V0, ASSERT_NO_EXCEPTION);
   shadowRoot->setInnerHTML(
       "<content select=\"i\"></content><u>Foo</u><content></content>");
   Node* textInBElement = document().body()->firstChild()->firstChild();
   Node* textInIElement = document().body()->lastChild()->firstChild();
   Node* textInUElement = shadowRoot->childNodes()->item(1)->firstChild();
   document().updateStyleAndLayout();
 
   int identifier = 0;
   WebString searchText(String("fOO"));
   WebFindOptions findOptions;  // Default.
 
   textFinder().resetMatchCount();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   // TextIterator currently returns the matches in the flat tree order,
   // so in this case the matches will be returned in the order of
   // <i> -> <u> -> <b>.
   EXPECT_EQ(3, textFinder().totalMatchCount());
   WebVector<WebFloatRect> matchRects;
   textFinder().findMatchRects(matchRects);
   ASSERT_EQ(3u, matchRects.size());
   EXPECT_EQ(findInPageRect(textInIElement, 0, textInIElement, 3),
             matchRects[0]);
   EXPECT_EQ(findInPageRect(textInUElement, 0, textInUElement, 3),
             matchRects[1]);
   EXPECT_EQ(findInPageRect(textInBElement, 0, textInBElement, 3),
             matchRects[2]);
 }
 
 TEST_F(TextFinderTest, ScopeRepeatPatternTextMatches) {
   document().body()->setInnerHTML("ab ab ab ab ab");
   document().updateStyleAndLayout();
 
   Node* textNode = document().body()->firstChild();
 
   int identifier = 0;
   WebString searchText(String("ab ab"));
   WebFindOptions findOptions;  // Default.
 
   textFinder().resetMatchCount();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   EXPECT_EQ(2, textFinder().totalMatchCount());
   WebVector<WebFloatRect> matchRects;
   textFinder().findMatchRects(matchRects);
   ASSERT_EQ(2u, matchRects.size());
   EXPECT_EQ(findInPageRect(textNode, 0, textNode, 5), matchRects[0]);
   EXPECT_EQ(findInPageRect(textNode, 6, textNode, 11), matchRects[1]);
 }
 
 TEST_F(TextFinderTest, OverlappingMatches) {
   document().body()->setInnerHTML("aababaa");
   document().updateStyleAndLayout();
 
   Node* textNode = document().body()->firstChild();
 
   int identifier = 0;
   WebString searchText(String("aba"));
   WebFindOptions findOptions;  // Default.
 
   textFinder().resetMatchCount();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   // We shouldn't find overlapped matches.
   EXPECT_EQ(1, textFinder().totalMatchCount());
   WebVector<WebFloatRect> matchRects;
   textFinder().findMatchRects(matchRects);
   ASSERT_EQ(1u, matchRects.size());
   EXPECT_EQ(findInPageRect(textNode, 1, textNode, 4), matchRects[0]);
 }
 
 TEST_F(TextFinderTest, SequentialMatches) {
   document().body()->setInnerHTML("ababab");
   document().updateStyleAndLayout();
 
   Node* textNode = document().body()->firstChild();
 
   int identifier = 0;
   WebString searchText(String("ab"));
   WebFindOptions findOptions;  // Default.
 
   textFinder().resetMatchCount();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   EXPECT_EQ(3, textFinder().totalMatchCount());
   WebVector<WebFloatRect> matchRects;
   textFinder().findMatchRects(matchRects);
   ASSERT_EQ(3u, matchRects.size());
   EXPECT_EQ(findInPageRect(textNode, 0, textNode, 2), matchRects[0]);
   EXPECT_EQ(findInPageRect(textNode, 2, textNode, 4), matchRects[1]);
   EXPECT_EQ(findInPageRect(textNode, 4, textNode, 6), matchRects[2]);
 }
 
 TEST_F(TextFinderTest, FindTextJavaScriptUpdatesDOM) {
   document().body()->setInnerHTML("<b>XXXXFindMeYYYY</b><i></i>");
   document().updateStyleAndLayout();
 
   int identifier = 0;
   WebString searchText(String("FindMe"));
   WebFindOptions findOptions;  // Default.
   bool wrapWithinFrame = true;
   bool activeNow;
 
   textFinder().resetMatchCount();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   findOptions.findNext = true;
   ASSERT_TRUE(textFinder().find(identifier, searchText, findOptions,
                                 wrapWithinFrame, &activeNow));
   EXPECT_TRUE(activeNow);
   ASSERT_TRUE(textFinder().find(identifier, searchText, findOptions,
                                 wrapWithinFrame, &activeNow));
   EXPECT_TRUE(activeNow);
 
   // Add new text to DOM and try FindNext.
   Element* iElement = toElement(document().body()->lastChild());
   ASSERT_TRUE(iElement);
   iElement->setInnerHTML("ZZFindMe");
   document().updateStyleAndLayout();
 
   ASSERT_TRUE(textFinder().find(identifier, searchText, findOptions,
                                 wrapWithinFrame, &activeNow));
   Range* activeMatch = textFinder().activeMatch();
   ASSERT_TRUE(activeMatch);
   EXPECT_FALSE(activeNow);
   EXPECT_EQ(2, activeMatch->startOffset());
   EXPECT_EQ(8, activeMatch->endOffset());
 
   // Restart full search and check that added text is found.
   findOptions.findNext = false;
   textFinder().resetMatchCount();
   textFinder().cancelPendingScopingEffort();
-  textFinder().scopeStringMatches(identifier, searchText, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
   EXPECT_EQ(2, textFinder().totalMatchCount());
 
   WebVector<WebFloatRect> matchRects;
   textFinder().findMatchRects(matchRects);
   ASSERT_EQ(2u, matchRects.size());
   Node* textInBElement = document().body()->firstChild()->firstChild();
   Node* textInIElement = document().body()->lastChild()->firstChild();
   EXPECT_EQ(findInPageRect(textInBElement, 4, textInBElement, 10),
@@ skipping 39 matching lines @@
   document().body()->setInnerHTML(text);
   document().updateStyleAndLayout();
 
   int identifier = 0;
   WebFindOptions findOptions;  // Default.
 
   textFinder().resetMatchCount();
 
   // There will be only one iteration before timeout, because increment
   // of the TimeProxyPlatform timer is greater than timeout threshold.
-  textFinder().scopeStringMatches(identifier, searchPattern, findOptions, true);
+  textFinder().startScopingStringMatches(identifier, searchPattern,
+                                         findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   EXPECT_EQ(4, textFinder().totalMatchCount());
 }
 
 }  // namespace blink