Refactor TextFinder::scopeStringMatches().

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 4629 matching lines @@
   const int kNumResults = 17;
 
   WebFindOptions options;
   WebString searchText = WebString::fromUTF8(kFindString);
   WebLocalFrameImpl* mainFrame = webViewHelper.webView()->mainFrameImpl();
   EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
 
   mainFrame->ensureTextFinder().resetMatchCount();
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchText, options);
+  }
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
 
   WebVector<WebFloatRect> webMatchRects;
   mainFrame->findMatchRects(webMatchRects);
   ASSERT_EQ(static_cast<size_t>(kNumResults), webMatchRects.size());
   int rectsVersion = mainFrame->findMatchMarkersVersion();
 
   for (int resultIndex = 0; resultIndex < kNumResults; ++resultIndex) {
@@ skipping 40 matching lines @@
   const int kFindIdentifier = 7777;
   const int kActiveIndex = 1;
 
   WebFindOptions options;
   WebString searchText = WebString::fromUTF8(kFindString);
   WebLocalFrameImpl* mainFrame = webViewHelper.webView()->mainFrameImpl();
   EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
   mainFrame->ensureTextFinder().resetMatchCount();
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchText, options);
+  }
 
   runPendingTasks();
   EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
   mainFrame->stopFinding(WebLocalFrame::StopFindActionClearSelection);
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchText, options);
+  }
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
   EXPECT_EQ(kActiveIndex, client.activeIndex());
 
   const char* kFindStringNew = "e";
   WebString searchTextNew = WebString::fromUTF8(kFindStringNew);
 
   EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchTextNew, options, false));
   mainFrame->ensureTextFinder().resetMatchCount();
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchTextNew,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchTextNew, options);
+  }
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
   EXPECT_EQ(kActiveIndex, client.activeIndex());
 }
 
 TEST_P(ParameterizedWebFrameTest, FindOnDetachedFrame) {
   registerMockedHttpURLLoad("find_in_page.html");
   registerMockedHttpURLLoad("find_in_page_frame.html");
 
@@ skipping 18 matching lines @@
 
   EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
   EXPECT_FALSE(secondFrame->find(kFindIdentifier, searchText, options, false));
 
   runPendingTasks();
   EXPECT_FALSE(client.findResultsAreReady());
 
   mainFrame->ensureTextFinder().resetMatchCount();
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchText, options);
+  }
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
 }
 
 TEST_P(ParameterizedWebFrameTest, FindDetachFrameBeforeScopeStrings) {
   registerMockedHttpURLLoad("find_in_page.html");
   registerMockedHttpURLLoad("find_in_page_frame.html");
 
   FindUpdateWebFrameClient client;
@@ skipping 16 matching lines @@
 
   runPendingTasks();
   EXPECT_FALSE(client.findResultsAreReady());
 
   // Detach the frame between finding and scoping.
   removeElementById(mainFrame, "frame");
 
   mainFrame->ensureTextFinder().resetMatchCount();
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchText, options);
+  }
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
 }
 
 TEST_P(ParameterizedWebFrameTest, FindDetachFrameWhileScopingStrings) {
   registerMockedHttpURLLoad("find_in_page.html");
   registerMockedHttpURLLoad("find_in_page_frame.html");
 
   FindUpdateWebFrameClient client;
@@ skipping 13 matching lines @@
   for (WebFrame* frame = mainFrame; frame; frame = frame->traverseNext())
     EXPECT_TRUE(frame->toWebLocalFrame()->find(kFindIdentifier, searchText,
                                                options, false));
 
   runPendingTasks();
   EXPECT_FALSE(client.findResultsAreReady());
 
   mainFrame->ensureTextFinder().resetMatchCount();
 
   for (WebLocalFrameImpl* frame = mainFrame; frame;
-       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext()))
-    frame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                 options, true);
+       frame = static_cast<WebLocalFrameImpl*>(frame->traverseNext())) {
+    frame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                        searchText, options);
+  }
 
-  // The first scopeStringMatches will have reset the state. Detach before it
-  // actually scopes.
+  // The first startScopingStringMatches will have reset the state. Detach
+  // before it actually scopes.
   removeElementById(mainFrame, "frame");
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
 }
 
 TEST_P(ParameterizedWebFrameTest, ResetMatchCount) {
   registerMockedHttpURLLoad("find_in_generated_frame.html");
 
   FindUpdateWebFrameClient client;
@@ skipping 34 matching lines @@
 
   const char kFindString[] = "foo";
   const int kFindIdentifier = 12345;
 
   WebFindOptions options;
   WebString searchText = WebString::fromUTF8(kFindString);
   WebLocalFrameImpl* mainFrame = webViewHelper.webView()->mainFrameImpl();
   EXPECT_TRUE(mainFrame->find(kFindIdentifier, searchText, options, false));
 
   mainFrame->ensureTextFinder().resetMatchCount();
-  mainFrame->ensureTextFinder().scopeStringMatches(kFindIdentifier, searchText,
-                                                   options, true);
+  mainFrame->ensureTextFinder().startScopingStringMatches(kFindIdentifier,
+                                                          searchText, options);
 
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
 
   // Get the tickmarks for the original find request.
   FrameView* frameView = webViewHelper.webView()->mainFrameImpl()->frameView();
   Scrollbar* scrollbar = frameView->createScrollbar(HorizontalScrollbar);
   Vector<IntRect> originalTickmarks;
   scrollbar->getTickmarks(originalTickmarks);
   EXPECT_EQ(4u, originalTickmarks.size());
@@ skipping 30 matching lines @@
   runPendingTasks();
 
   WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
   const int findIdentifier = 12345;
   static const char* kFindString = "foo";
   WebString searchText = WebString::fromUTF8(kFindString);
   WebFindOptions options;
   bool activeNow;
 
   frame->ensureTextFinder().resetMatchCount();
-  frame->ensureTextFinder().scopeStringMatches(findIdentifier, searchText,
-                                               options, true);
+  frame->ensureTextFinder().startScopingStringMatches(findIdentifier,
+                                                      searchText, options);
   runPendingTasks();
   EXPECT_TRUE(client.findResultsAreReady());
 
   // Find in a <div> element.
   options.findNext = true;
   EXPECT_TRUE(
       frame->find(findIdentifier, searchText, options, false, &activeNow));
   EXPECT_TRUE(activeNow);
 
   // Insert new text, which contains occurence of |searchText|.
@@ skipping 5966 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink