aura: Add fullscreen/popups to RenderWidgetHostViewAura.

content/browser/renderer_host/web_input_event_aura.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/web_input_event_aura.h"
 
 #include "ui/aura/event.h"
+#include "ui/aura/window.h"
 
 namespace content {
 
 #if defined(OS_WIN)
 WebKit::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent(
     base::NativeEvent native_event);
 WebKit::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent(
     base::NativeEvent native_event);
 WebKit::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
     base::NativeEvent native_event);
@@ skipping 25 matching lines @@
 // aura::Event's base::NativeEvent, and then replace the coordinate fields with
 // the translated values from the aura::Event.
 //
 // The exception is mouse events on linux. The aura::MouseEvent contains enough
 // necessary information to construct a WebMouseEvent. So instead of extracting
 // the information from the XEvent, which can be tricky when supporting both
 // XInput2 and XInput, the WebMouseEvent is constructed from the
 // aura::MouseEvent. This will not be necessary once only XInput2 is supported.
 //
 
-WebKit::WebMouseEvent MakeWebMouseEvent(aura::MouseEvent* event) {
+WebKit::WebMouseEvent MakeWebMouseEvent(aura::MouseEvent* event,
+                                        aura::Window* window) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   WebKit::WebMouseEvent webkit_event =
       MakeUntranslatedWebMouseEventFromNativeEvent(event->native_event());
 #else
   WebKit::WebMouseEvent webkit_event = MakeWebMouseEventFromAuraEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
   // |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 screen_point =

[sadrul, 2011/10/27 22:47:20]

For the screen-location, it would be nice if we can extract this from the
base::NativeEvent. It should be possible on X11, is it possible on windows?

[Ben Goodger (Google), 2011/10/27 22:56:11]

We can assume "screen" to mean "client position within the desktop host's
window".

This is probably required for web compat.

[Daniel Erat, 2011/10/28 00:53:13]

Done.

+      window->GetPointInScreenCoordinates(event->location());
+  webkit_event.globalX = screen_point.x();
+  webkit_event.globalY = screen_point.y();
 
   return webkit_event;
 }
 
-WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(aura::MouseEvent* event) {
+WebKit::WebMouseWheelEvent MakeWebMouseWheelEvent(aura::MouseEvent* event,
+                                                  aura::Window* window) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   WebKit::WebMouseWheelEvent webkit_event =
       MakeUntranslatedWebMouseWheelEventFromNativeEvent(event->native_event());
 #else
   WebKit::WebMouseWheelEvent webkit_event =
       MakeWebMouseWheelEventFromAuraEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
   // |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 screen_point =
+      window->GetPointInScreenCoordinates(event->location());
+  webkit_event.globalX = screen_point.x();
+  webkit_event.globalY = screen_point.y();
 
   return webkit_event;
 }
 
 WebKit::WebKeyboardEvent MakeWebKeyboardEvent(aura::KeyEvent* event) {
   // Windows can figure out whether or not to construct a RawKeyDown or a Char
   // WebInputEvent based on the type of message carried in
   // event->native_event(). X11 is not so fortunate, there is no separate
   // translated event type, so DesktopHostLinux sends an extra KeyEvent with
   // is_char() == true. We need to pass the aura::KeyEvent to the X11 function
   // to detect this case so the right event type can be constructed.
 #if defined(OS_WIN)
   // Key events require no translation by the aura system.
   return MakeWebKeyboardEventFromNativeEvent(event->native_event());
 #else
   return MakeWebKeyboardEventFromAuraEvent(event);
 #endif
 }
 
 WebKit::WebTouchPoint* UpdateWebTouchEvent(aura::TouchEvent* event,
                                            WebKit::WebTouchEvent* web_event) {
 #if defined(OS_WIN)
   return UpdateWebTouchEventFromNativeEvent(event->native_event(), web_event);
 #else
   return UpdateWebTouchEventFromAuraEvent(event, web_event);
 #endif
 }
 
 }  // namespace content