diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:44 +0200 |
| commit | 4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78 (patch) | |
| tree | 9dc9c3ba8ab461f7ee3d444222246be5ed55ae3f /chromium/content/browser/find_request_manager.cc | |
| parent | 19de26b7efd6b993f2af26cf435f04c716d3f5bc (diff) | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
| download | qtwebengine-chromium-4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78.tar.gz | |
Merge branch 'upstream-master' into 58-based
Change-Id: I8c280ca9068fdda9cf6276725bfb8608eccb497a
Diffstat (limited to 'chromium/content/browser/find_request_manager.cc')
| -rw-r--r-- | chromium/content/browser/find_request_manager.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/content/browser/find_request_manager.cc b/chromium/content/browser/find_request_manager.cc index 5c2eeb2df37..7713bc3a5b9 100644 --- a/chromium/content/browser/find_request_manager.cc +++ b/chromium/content/browser/find_request_manager.cc @@ -158,9 +158,13 @@ void FindRequestManager::OnFindReply(RenderFrameHost* rfh, number_of_matches_ += matches_delta; matches_per_frame_it->second = number_of_matches; + // All matches may have been removed since the last find reply. + if (rfh == active_frame_ && !number_of_matches) + relative_active_match_ordinal_ = 0; + // The active match ordinal may need updating since the number of matches // before the active match may have changed. - if (rfh != active_frame_) + if (rfh != active_frame_ || !number_of_matches) UpdateActiveMatchOrdinal(); } } |