Fix search restart after zero entries (again).

BUG=669983

Change-Id: Id8eb817b3720394adce9c68c3aa535945a65b544
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 7 insertions, 6 deletions

diff --git a/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.cc b/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.cc
index 67736f9c97c..c1b63cacc63 100644
--- a/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.cc
+++ b/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.cc
@@ -287,4 +287,8 @@ void FindTaskController::Trace(Visitor* visitor) {
   visitor->Trace(resume_finding_from_range_);
 }
 
+void FindTaskController::ResetLastFindRequestCompletedWithNoMatches() {
+  last_find_request_completed_with_no_matches_ = false;
+}
+
 }  // namespace blink
diff --git a/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.h b/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.h
index 1b99f852f8b..327d0348af8 100644
--- a/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.h
+++ b/chromium/third_party/blink/renderer/core/editing/finder/find_task_controller.h
@@ -76,6 +76,8 @@ class CORE_EXPORT FindTaskController final
 
   void Trace(Visitor* visitor);
 
+  void ResetLastFindRequestCompletedWithNoMatches();
+
  private:
   void RequestIdleFindTask(int identifier,
                            const WebString& search_text,
diff --git a/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc b/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
index 1f9438e77b9..acdf521403f 100644
--- a/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
+++ b/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
@@ -204,7 +204,7 @@ bool TextFinder::Find(int identifier,
   }
 
   // We found something, so the result of the previous scoping may be outdated.
-  last_find_request_completed_with_no_matches_ = false;
+  find_task_controller_->ResetLastFindRequestCompletedWithNoMatches();
 
   return true;
 }
@@ -661,7 +661,6 @@ TextFinder::TextFinder(WebLocalFrameImpl& owner_frame)
       find_match_markers_version_(0),
       should_locate_active_rect_(false),
       scoping_in_progress_(false),
-      last_find_request_completed_with_no_matches_(false),
       find_match_rects_are_valid_(false) {}
 
 TextFinder::~TextFinder() = default;
diff --git a/chromium/third_party/blink/renderer/core/editing/finder/text_finder.h b/chromium/third_party/blink/renderer/core/editing/finder/text_finder.h
index 3c3b9ab0001..e46acb0d66f 100644
--- a/chromium/third_party/blink/renderer/core/editing/finder/text_finder.h
+++ b/chromium/third_party/blink/renderer/core/editing/finder/text_finder.h
@@ -240,10 +240,6 @@ class CORE_EXPORT TextFinder final
   // Keeps track of whether there is an scoping effort ongoing in the frame.
   bool scoping_in_progress_;
 
-  // Keeps track of whether the last find request completed its scoping effort
-  // without finding any matches in this frame.
-  bool last_find_request_completed_with_no_matches_;
-
   // Determines if the rects in the find-in-page matches cache of this frame
   // are invalid and should be recomputed.
   bool find_match_rects_are_valid_;