Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

Issue 10113012: Merge 114275 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (revision 114641)
+++ Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (working copy)
@@ -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();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698