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

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 1971 matching lines @@
 
 void WebLocalFrameImpl::requestFind(int identifier, const WebString& searchText, const WebFindOptions& options)
 {
     // Send "no results" if this frame has no visible content.
     if (!hasVisibleContent()) {
         client()->reportFindInPageMatchCount(identifier, 0 /* count */, true /* finalUpdate */);
         return;
     }
 
     WebRange currentSelection = selectionRange();
-
     bool result = false;
     bool activeNow = false;
 
     // Search for an active match only if this frame is focused or if this is a
     // find next request.
     if (isFocused() || options.findNext) {
         result = find(identifier, searchText, options, false /* wrapWithinFrame */, &activeNow);
     }
 
     if (result && !options.findNext) {
         // Indicate that at least one match has been found. 1 here means
         // possibly more matches could be coming.
         client()->reportFindInPageMatchCount(identifier, 1 /* count */, false /* finalUpdate */);
     }
 
     // There are three cases in which scoping is needed:
     //
-    // 1) This is an initial find request (|options.findNext| is false). This
+    // (1) This is an initial find request (|options.findNext| is false). This
     // will be the first scoping effort for this find session.
     //
-    // 2) Something has been selected since the last search. This means that we
+    // (2) Something has been selected since the last search. This means that we
     // cannot just increment the current match ordinal; we need to re-generate
     // it.
     //
-    // 3) TextFinder::Find() could not locate the next active find match, so it
-    // needs to be re-scoped.
+    // (3) TextFinder::Find() found what should be the next match (|result| is
+    // true), but was unable to activate it (|activeNow| is false). This means
+    // that the text containing this match was dynamically added since the last
+    // scope of the frame. The frame needs to be re-scoped so that any matches
+    // in the new text can be highlighted and included in the reported number of
+    // matches.
     //
     // If none of these cases are true, then we just report the current match
     // count without scoping.
-    if (options.findNext && currentSelection.isNull() && activeNow) {
+    if (/* (1) */ options.findNext
+        && /* (2) */ currentSelection.isNull()
+        && /* (3) */ !(result && !activeNow)) {
         // Force report of the actual count.
         increaseMatchCount(0, identifier);
         return;
     }
 
     // Scoping effort begins.
     ensureTextFinder().resetMatchCount();
     textFinder()->cancelPendingScopingEffort();
 
     // Start a new scoping request. If the scoping function determines that it
@@ skipping 207 matching lines @@
         feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
     } else if (metric == "wasAlternateProtocolAvailable") {
         feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
     } else if (metric == "connectionInfo") {
         feature = UseCounter::ChromeLoadTimesConnectionInfo;
     }
     UseCounter::count(frame(), feature);
 }
 
 } // namespace blink