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

Unified Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 8417008: aura: Add fullscreen/popups to RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 2 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 | « content/browser/renderer_host/web_input_event_aura.h ('k') | ui/aura/desktop_host_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/web_input_event_aura.cc
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc
index d92fdca5b480e448e5a87d83deb853897474197a..e57c74f71ba2749d0b7f9913bc0c376c7588764b 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/content/browser/renderer_host/web_input_event_aura.cc
@@ -5,6 +5,7 @@
#include "content/browser/renderer_host/web_input_event_aura.h"
#include "ui/aura/event.h"
+#include "ui/aura/window.h"
namespace content {
@@ -64,9 +65,10 @@ WebKit::WebMouseEvent MakeWebMouseEvent(aura::MouseEvent* event) {
webkit_event.windowX = webkit_event.x = event->x();
webkit_event.windowY = webkit_event.y = event->y();
- // TODO(beng): map these to screen coordinates.
- webkit_event.globalX = event->x();
- webkit_event.globalY = event->y();
+ const gfx::Point host_point =
+ ui::EventLocationFromNative(event->native_event());
+ webkit_event.globalX = host_point.x();
+ webkit_event.globalY = host_point.y();
return webkit_event;
}
@@ -86,9 +88,10 @@ WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(aura::MouseEvent* event) {
webkit_event.windowX = webkit_event.x = event->x();
webkit_event.windowY = webkit_event.y = event->y();
- // TODO(beng): map these to screen coordinates.
- webkit_event.globalX = event->x();
- webkit_event.globalY = event->y();
+ const gfx::Point host_point =
+ ui::EventLocationFromNative(event->native_event());
+ webkit_event.globalX = host_point.x();
+ webkit_event.globalY = host_point.y();
return webkit_event;
}
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.h ('k') | ui/aura/desktop_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698