Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2144673003: Audit the use of updateStyleAndLayoutIgnorePendingStylesheets in SearchBuffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback addressed. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 75ed9772cec9170c2f9b0d3e9bd5a34a49392ccd..6fc3d8e910afe2a966227225e9592acd23fa483b 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -1962,12 +1962,22 @@ void WebLocalFrameImpl::didCallIsSearchProviderInstalled()
bool WebLocalFrameImpl::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect, bool* activeNow)
{
+ if (!frame())
+ return false;
+
+ // Unlikely, but just in case we try to find-in-page on a detached frame.
+ DCHECK(frame()->host());
+
// Search for an active match only if this frame is focused or if this is a
// find next request.
- if (isFocused() || options.findNext)
- return ensureTextFinder().find(identifier, searchText, options, wrapWithinFrame, selectionRect, activeNow);
+ if (!isFocused() && !options.findNext)
+ return false;
- return false;
+ // Up-to-date, clean tree is required for finding text in page, since it relies
+ // on TextIterator to look over the text.
+ frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+ return ensureTextFinder().find(identifier, searchText, options, wrapWithinFrame, selectionRect, activeNow);
}
void WebLocalFrameImpl::stopFinding(StopFindAction action)
« no previous file with comments | « third_party/WebKit/Source/web/TextFinder.cpp ('k') | third_party/WebKit/Source/web/tests/TextFinderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698