Title: [121444] branches/chromium/1132/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
- Revision
- 121444
- Author
- [email protected]
- Date
- 2012-06-28 11:09:14 -0700 (Thu, 28 Jun 2012)
Log Message
Merge 120881
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10692027
Modified Paths
Diff
Modified: branches/chromium/1132/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (121443 => 121444)
--- branches/chromium/1132/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-06-28 18:08:46 UTC (rev 121443)
+++ branches/chromium/1132/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-06-28 18:09:14 UTC (rev 121444)
@@ -463,8 +463,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.
@@ -473,8 +473,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
