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 @@
 
     // There are three cases in which scoping is needed:
     //
     // 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
     // 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) This frame is currently scoping, so we continue the scoping effort.
     //
     // If none of these cases are true, then we just report the current match
     // count without scoping.
-    if (options.findNext && currentSelection.isNull() && activeNow) {
+    if (options.findNext && currentSelection.isNull() && !textFinder()->scopingInProgress()) {

[esprehn, 2016/08/11 09:40:01]

Actually this means the activeNow bool in this function is just ignored, why is
that correct? What's the purpose of activeNow if we don't use it?

         // 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 174 matching lines @@
 {
     frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
 }
 
 void WebLocalFrameImpl::clearActiveFindMatch()
 {
     ensureTextFinder().clearActiveFindMatch();
 }
 
 } // namespace blink