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

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

Issue 13190003: Merge 147181 "[chromium] Use widget.parent() for plugin WebMouse..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/WebInputEventConversion.cpp
===================================================================
--- Source/WebKit/chromium/src/WebInputEventConversion.cpp (revision 147287)
+++ Source/WebKit/chromium/src/WebInputEventConversion.cpp (working copy)
@@ -433,8 +433,10 @@
webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond;
webEvent.modifiers = getWebInputModifiers(event);
- ScrollView* view = widget.root();
- IntPoint windowPoint = view->contentsToWindow(IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()));
+ ScrollView* view = widget.parent();
+ IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
+ if (view)
+ windowPoint = view->contentsToWindow(windowPoint);
webEvent.globalX = event.screenX();
webEvent.globalY = event.screenY();
webEvent.windowX = windowPoint.x();
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698