Title: [132832] branches/chromium/1271/Source/WebKit/chromium/src/WebFrameImpl.cpp
- Revision
- 132832
- Author
- [email protected]
- Date
- 2012-10-29 11:56:27 -0700 (Mon, 29 Oct 2012)
Log Message
Merge 132746 (partial) - [Chromium] Find-in-page reports matches in hidden iframes
https://bugs.webkit.org/show_bug.cgi?id=100604
Reviewed by Eric Seidel.
This is actually a regression caused by
http://trac.webkit.org/changeset/128784. This patch adds back some code
removed in WebFrameImpl::shouldScopeMatches in r128784.
This patch also introduces a test so that we don't make this mistake
again.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::shouldScopeMatches):
[email protected]
Review URL: https://codereview.chromium.org/11343020
Modified Paths
Diff
Modified: branches/chromium/1271/Source/WebKit/chromium/src/WebFrameImpl.cpp (132831 => 132832)
--- branches/chromium/1271/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-10-29 18:50:11 UTC (rev 132831)
+++ branches/chromium/1271/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-10-29 18:56:27 UTC (rev 132832)
@@ -2576,7 +2576,7 @@
{
// Don't scope if we can't find a frame or a view.
// 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());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
