Fix search restart after zero entries.

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 490 matching lines @@
   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),
             matchRects[0]);
   EXPECT_EQ(findInPageRect(textInIElement, 2, textInIElement, 8),
             matchRects[1]);
 }
 
+TEST_F(TextFinderTest, FindTextJavaScriptUpdatesDOMAfterNoMatches) {
+  document().body()->setInnerHTML("<b>XXXXYYYY</b><i></i>");
+  document().updateStyleAndLayout();
+
+  int identifier = 0;
+  WebString searchText(String("FindMe"));
+  WebFindOptions findOptions;  // Default.
+  bool wrapWithinFrame = true;
+  bool activeNow = false;
+
+  textFinder().resetMatchCount();
+  textFinder().startScopingStringMatches(identifier, searchText, findOptions);
+  while (textFinder().scopingInProgress())
+    runPendingTasks();
+
+  findOptions.findNext = true;
+  ASSERT_FALSE(textFinder().find(identifier, searchText, findOptions,
+                                 wrapWithinFrame, &activeNow));
+  EXPECT_FALSE(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().startScopingStringMatches(identifier, searchText, findOptions);
+  while (textFinder().scopingInProgress())
+    runPendingTasks();
+  EXPECT_EQ(1, textFinder().totalMatchCount());
+
+  WebVector<WebFloatRect> matchRects;
+  textFinder().findMatchRects(matchRects);
+  ASSERT_EQ(1u, matchRects.size());
+  Node* textInIElement = document().body()->lastChild()->firstChild();
+  EXPECT_EQ(findInPageRect(textInIElement, 2, textInIElement, 8),
+            matchRects[0]);
+}
+
 class TextFinderFakeTimerTest : public TextFinderTest {
  protected:
   void SetUp() override {
     s_timeElapsed = 0.0;
     m_originalTimeFunction = setTimeFunctionsForTesting(returnMockTime);
   }
 
   void TearDown() override {
     setTimeFunctionsForTesting(m_originalTimeFunction);
   }
@@ skipping 33 matching lines @@
   // of the TimeProxyPlatform timer is greater than timeout threshold.
   textFinder().startScopingStringMatches(identifier, searchPattern,
                                          findOptions);
   while (textFinder().scopingInProgress())
     runPendingTasks();
 
   EXPECT_EQ(4, textFinder().totalMatchCount());
 }
 
 }  // namespace blink