Restart search in page when new text is found.

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 5074 matching lines @@
 
   // Check for multiple searchable frames.
   bool multi_frame = (main_frame->traverseNextLocal(true) != main_frame);
 
   // If we have multiple frames, we don't want to wrap the search within the
   // frame, so we check here if we only have |main_frame| in the chain.
   bool wrap_within_frame = !multi_frame;
 
   WebRect selection_rect;
   bool result = false;
+  bool active_now;
 
   // If something is selected when we start searching it means we cannot just
   // increment the current match ordinal; we need to re-generate it.
   WebRange current_selection = focused_frame->selectionRange();
 
   do {
-    result = search_frame->find(request_id, search_text, options,
-                                wrap_within_frame, &selection_rect);
+    result =
+        search_frame->find(request_id, search_text, options, wrap_within_frame,
+                           &selection_rect, &active_now);
 
     if (!result) {
       // Don't leave text selected as you move to the next frame.
       search_frame->executeCommand(WebString::fromUTF8("Unselect"),
                                    GetFocusedElement());
 
       // Find the next frame, but skip the invisible ones.
       do {
         // What is the next frame to search (we might be going backwards)? Note
         // that we specify wrap=true so that search_frame never becomes NULL.
         search_frame = options.forward
                 ? search_frame->traverseNextLocal(true)
                 : search_frame->traversePreviousLocal(true);
       } while (!search_frame->hasVisibleContent() &&
                search_frame != focused_frame);
 
       // Make sure selection doesn't affect the search operation in new frame.
       search_frame->executeCommand(WebString::fromUTF8("Unselect"),
                                    GetFocusedElement());
 
       // If we have multiple frames and we have wrapped back around to the
       // focused frame, we need to search it once more allowing wrap within
       // the frame, otherwise it will report 'no match' if the focused frame has
       // reported matches, but no frames after the focused_frame contain a
       // match for the search word(s).
       if (multi_frame && search_frame == focused_frame) {
         result = search_frame->find(request_id, search_text, options,
                                     true,  // Force wrapping.
-                                    &selection_rect);
+                                    &selection_rect, &active_now);
       }
     }
 
     render_view_->webview()->setFocusedFrame(search_frame);
   } while (!result && search_frame != focused_frame);
 
-  if (options.findNext && current_selection.isNull()) {
+  if (options.findNext && current_selection.isNull() && active_now) {
     // Force the main_frame to report the actual count.
     main_frame->increaseMatchCount(0, request_id);
   } else {
     // If nothing is found, set result to "0 of 0", otherwise, set it to
     // "-1 of 1" to indicate that we found at least one item, but we don't know
     // yet what is active.
     int ordinal = result ? -1 : 0;  // -1 here means we might know more later.
     int match_count = result ? 1 : 0;  // 1 here means possibly more coming.
 
     // If we find no matches then this will be our last status update.
@@ skipping 990 matching lines @@
                                     int match_count,
                                     int ordinal,
                                     const WebRect& selection_rect,
                                     bool final_status_update) {
   Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
                                    selection_rect, ordinal,
                                    final_status_update));
 }
 
 }  // namespace content