Handling new frames and frame navigations with find-in-page during a find session.

third_party/WebKit/Source/web/TextFinder.cpp

Index: third_party/WebKit/Source/web/TextFinder.cpp
diff --git a/third_party/WebKit/Source/web/TextFinder.cpp b/third_party/WebKit/Source/web/TextFinder.cpp
index ceeadf3169d765159d7f38b9941c047527427e99..8d55b6a72a4eaa423ba1a06535d1765d273feaf2 100644
--- a/third_party/WebKit/Source/web/TextFinder.cpp
+++ b/third_party/WebKit/Source/web/TextFinder.cpp
@@ -200,6 +200,7 @@ bool TextFinder::find(int identifier, const WebString& searchText, const WebFind
         reportFindInPageSelection(selectionRect, m_activeMatchIndex + 1, identifier);
     }
 
+    m_lastFindRequestCompletedWithNoMatches = false;

[dcheng, 2016/09/21 07:15:44]

Ditto: what is the significance behind these two changes? I just don't have
enough of the find state machine in my head to understand the purpose.

[paulmeyer, 2016/09/21 15:40:52]

First change:

By this point in this function, at least one match has been found, so
|m_lastFindRequestCompletedWithNoMatches| should definitely be false. Without
this, there are some problems with TextFinder not searching certain frames when
it really should. I actually ended up already landing this one line change
separately in the mean time to fix these problems faster. This is no longer part
of this patch.

Second change:

I'm not sure if this is actually specifically needed for this patch, but the
active match should be reset if it is being cleared. I wrote this function
myself in a previous patch, and I think I just missed doing this, so I figured
I'd fix it. I could put this in a separate patch if you'd like though.

     return true;
 }
 
@@ -207,6 +208,7 @@ void TextFinder::clearActiveFindMatch()
 {
     m_currentActiveMatchFrame = false;
     setMarkerActive(m_activeMatch.get(), false);
+    resetActiveMatch();
 }
 
 void TextFinder::stopFindingAndClearSelection()
@@ -284,7 +286,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
         return;
     }
 
-    if (!shouldScopeMatches(searchText)) {
+    if (!shouldScopeMatches(searchText, options)) {
         finishCurrentScopingEffort(identifier);
         return;
     }
@@ -672,17 +674,23 @@ void TextFinder::unmarkAllTextMatches()
         frame->document()->markers().removeMarkers(DocumentMarker::TextMatch);
 }
 
-bool TextFinder::shouldScopeMatches(const String& searchText)
+bool TextFinder::shouldScopeMatches(const String& searchText, const WebFindOptions& options)
 {
     // Don't scope if we can't find a frame or a view.
     // The user may have closed the tab/application, so abort.
     LocalFrame* frame = ownerFrame().frame();
-    if (!frame || !frame->view() || !frame->page() || !ownerFrame().hasVisibleContent())
+    if (!frame || !frame->view() || !frame->page())
         return false;
 
     DCHECK(frame->document());
     DCHECK(frame->view());
 
+    if (options.force)
+        return true;
+
+    if (!ownerFrame().hasVisibleContent())
+        return false;
+
     // If the frame completed the scoping operation and found 0 matches the last
     // time it was searched, then we don't have to search it again if the user is
     // just adding to the search string or sending the same search string again.