Commit a0f3221c authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

Unreviewed, rolling out r128409.

http://trac.webkit.org/changeset/128409
https://bugs.webkit.org/show_bug.cgi?id=96622

It broke Chromium browser_tests (Requested by tkent on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-09-13

* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::scopeStringMatches):
(WebKit::WebFrameImpl::shouldScopeMatches):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128426 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6f88333e
2012-09-13 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r128409.
http://trac.webkit.org/changeset/128409
https://bugs.webkit.org/show_bug.cgi?id=96622
It broke Chromium browser_tests (Requested by tkent on
#webkit).
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::scopeStringMatches):
(WebKit::WebFrameImpl::shouldScopeMatches):
2012-09-13 Taiju Tsuiki <tzik@chromium.org>
 
Check if WorkerContext is terminated in WebWorkerClientImple::openFileSystem call.
......
......@@ -1779,10 +1779,8 @@ void WebFrameImpl::scopeStringMatches(int identifier,
const WebFindOptions& options,
bool reset)
{
if (!shouldScopeMatches(searchText)) {
increaseMatchCount(0, identifier);
if (!shouldScopeMatches(searchText))
return;
}
WebFrameImpl* mainFrameImpl = viewImpl()->mainFrameImpl();
......@@ -2614,9 +2612,9 @@ int WebFrameImpl::ordinalOfFirstMatchForFrame(WebFrameImpl* frame) const
bool WebFrameImpl::shouldScopeMatches(const String& searchText)
{
// Don't scope if we can't find a frame or a view.
// Don't scope if we can't find a frame or a view or if the frame is not visible.
// The user may have closed the tab/application, so abort.
if (!frame() || !frame()->view())
if (!frame() || !frame()->view() || !hasVisibleContent())
return false;
ASSERT(frame()->document() && frame()->view());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment