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

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index b63751118caf9add9186f4eea739d914af8eee9d..6afa8cb311b390c50565a9650214d5e61177d36d 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -1989,12 +1989,11 @@ void WebLocalFrameImpl::requestFind(int identifier, const WebString& searchText,
     // 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;