Title: [121177] branches/chromium/1180/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
- Revision
- 121177
- Author
- [email protected]
- Date
- 2012-06-25 13:14:19 -0700 (Mon, 25 Jun 2012)
Log Message
Merge 120881 - Perform hit-test from correct frame in isRectTopmost()
https://bugs.webkit.org/show_bug.cgi?id=89492
Patch by Raymes Khoury <[email protected]> on 2012-06-20
Reviewed by Levi Weintraub.
Hit-testing was being performed from the main frame, which gave the
incorrect result if the plugin was in a different frame.
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::isRectTopmost):
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10656025
Modified Paths
Diff
Modified: branches/chromium/1180/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (121176 => 121177)
--- branches/chromium/1180/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-06-25 19:47:57 UTC (rev 121176)
+++ branches/chromium/1180/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-06-25 20:14:19 UTC (rev 121177)
@@ -461,8 +461,8 @@
bool WebPluginContainerImpl::isRectTopmost(const WebRect& rect)
{
- Page* page = m_element->document()->page();
- if (!page)
+ Frame* frame = m_element->document()->frame();
+ if (!frame)
return false;
// hitTestResultAtPoint() takes a padding rectangle.
@@ -471,8 +471,7 @@
LayoutPoint center = documentRect.center();
// Make the rect we're checking (the point surrounded by padding rects) contained inside the requested rect. (Note that -1/2 is 0.)
LayoutSize padding((documentRect.width() - 1) / 2, (documentRect.height() - 1) / 2);
- HitTestResult result =
- page->mainFrame()->eventHandler()->hitTestResultAtPoint(center, false, false, DontHitTestScrollbars, HitTestRequest::ReadOnly | HitTestRequest::Active, padding);
+ HitTestResult result = frame->eventHandler()->hitTestResultAtPoint(center, false, false, DontHitTestScrollbars, HitTestRequest::ReadOnly | HitTestRequest::Active, padding);
const HitTestResult::NodeSet& nodes = result.rectBasedTestResult();
if (nodes.size() != 1)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
