Title: [114643] branches/chromium/1084/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
- Revision
- 114643
- Author
- [email protected]
- Date
- 2012-04-19 09:53:14 -0700 (Thu, 19 Apr 2012)
Log Message
Merge 114275
BUG=27086
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10113012
Modified Paths
Diff
Modified: branches/chromium/1084/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (114642 => 114643)
--- branches/chromium/1084/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-04-19 16:40:59 UTC (rev 114642)
+++ branches/chromium/1084/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-04-19 16:53:14 UTC (rev 114643)
@@ -453,10 +453,10 @@
// hitTestResultAtPoint() takes a padding rectangle.
// FIXME: We'll be off by 1 when the width or height is even.
- IntRect windowRect = convertToContainingWindow(static_cast<IntRect>(rect));
- LayoutPoint center = windowRect.center();
+ IntRect documentRect(x() + rect.x, y() + rect.y, rect.width, rect.height);
+ 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((windowRect.width() - 1) / 2, (windowRect.height() - 1) / 2);
+ 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);
const HitTestResult::NodeSet& nodes = result.rectBasedTestResult();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
