Fix find-in-page re-scope across frame boundaries.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index d2030c35e017a83ed17e6526dbb2907d173b90c1..833c38c96b87da89f86445c09663a18f64cd7300 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5226,15 +5226,13 @@ void RenderFrameImpl::OnFind(int request_id,
   }
 
   WebRect selection_rect;
-  bool active_now = false;
 
   // 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 = frame_->selectionRange();
 
   bool result = frame_->find(request_id, search_text, options,
-                             false /* wrapWithinFrame */, &selection_rect,
-                             &active_now);
+                             false /* wrapWithinFrame */, &selection_rect);
   if (result && !options.findNext) {
     // Indicate that at least one match has been found. 1 here means possibly
     // more matches could be coming. -1 here means that the exact active match
@@ -5243,7 +5241,8 @@ void RenderFrameImpl::OnFind(int request_id,
                   gfx::Rect(), false /* final_status_update */ );
   }
 
-  if (options.findNext && current_selection.isNull() && active_now) {
+  if (options.findNext && current_selection.isNull() &&
+      !frame_->scopingInProgress()) {

[dcheng, 2016/07/28 02:11:45]

Is this an urgent fix? I think we should explore moving these bits back into
Blink rather than exposing more functions in the public API. WDYT?

     // Force report of the actual count.
     frame_->increaseMatchCount(0, request_id);
     return;