Adjust aura synthetic mouse event locations to screen location.

content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

 // Copyright 2013 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/input/synthetic_gesture_target_aura.h"
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "content/common/input/input_event.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/events/gestures/gesture_configuration.h"
 
 using blink::WebTouchEvent;
 using blink::WebMouseWheelEvent;
 
 namespace content {
 
 SyntheticGestureTargetAura::SyntheticGestureTargetAura(
     RenderWidgetHostImpl* host)
     : SyntheticGestureTargetBase(host) {
 }
 
 void SyntheticGestureTargetAura::DispatchWebTouchEventToPlatform(
     const WebTouchEvent& web_touch,
     const ui::LatencyInfo& latency_info) {
-  aura::Window* window = render_widget_host()->GetView()->GetNativeView();
-  aura::Window* root_window = window->GetRootWindow();
+  aura::Window* window = GetWindow();
   aura::client::ScreenPositionClient* position_client =
-      aura::client::GetScreenPositionClient(root_window);
-  DCHECK(position_client);
+      GetScreenPositionClient();
 
   TouchEventWithLatencyInfo touch_with_latency(web_touch, latency_info);
 
   // SyntheticGesture may skip calculating screenPosition, so we will fill it
   // in here. "screenPosition" is converted from "position".
   const size_t num_touches = touch_with_latency.event.touchesLength;
   for (size_t i = 0; i < num_touches; ++ i) {
     blink::WebTouchPoint* point = &touch_with_latency.event.touches[i];
     gfx::Point position(point->position.x, point->position.y);
     position_client->ConvertPointToScreen(window, &position);
@@ skipping 10 matching lines @@
       GetRootWindowHostDelegate();
   for (ScopedVector<ui::TouchEvent>::iterator iter = events.begin(),
       end = events.end(); iter != end; ++iter) {
     root_window_host_delegate->OnHostTouchEvent(*iter);
   }
 }
 
 void SyntheticGestureTargetAura::DispatchWebMouseWheelEventToPlatform(
       const blink::WebMouseWheelEvent& web_wheel,
       const ui::LatencyInfo&) {
+  aura::Window* window = GetWindow();
+  aura::client::ScreenPositionClient* position_client =
+      GetScreenPositionClient();
   gfx::Point location(web_wheel.x, web_wheel.y);
+  position_client->ConvertPointToScreen(window, &location);
+
   ui::MouseEvent mouse_event(
       ui::ET_MOUSEWHEEL, location, location, ui::EF_NONE, ui::EF_NONE);
   ui::MouseWheelEvent wheel_event(
       mouse_event, web_wheel.deltaX, web_wheel.deltaY);
 
   GetRootWindowHostDelegate()->OnHostMouseEvent(&wheel_event);
 }
 
 namespace {
 
@@ skipping 42 matching lines @@
   }
 
   return 0;
 }
 
 }  // namespace
 
 void SyntheticGestureTargetAura::DispatchWebMouseEventToPlatform(
       const blink::WebMouseEvent& web_mouse,
       const ui::LatencyInfo& latency_info) {
+  aura::Window* window = GetWindow();
+  aura::client::ScreenPositionClient* position_client =
+      GetScreenPositionClient();
   gfx::Point location(web_mouse.x, web_mouse.y);
+  position_client->ConvertPointToScreen(window, &location);
+
   ui::EventType event_type = WebMouseEventTypeToEventType(web_mouse.type);
   int flags = WebMouseEventButtonToFlags(web_mouse.button);
-  // TODO: last argument (changed_button_flags) likely isn't right.
-  ui::MouseEvent mouse_event(event_type, location, location, flags, 0);
+  ui::MouseEvent mouse_event(event_type, location, location, flags, flags);
 
   GetRootWindowHostDelegate()->OnHostMouseEvent(&mouse_event);
 }
 
 SyntheticGestureParams::GestureSourceType
 SyntheticGestureTargetAura::GetDefaultSyntheticGestureSourceType() const {
   return SyntheticGestureParams::MOUSE_INPUT;
 }
 
 bool SyntheticGestureTargetAura::SupportsSyntheticGestureSourceType(
     SyntheticGestureParams::GestureSourceType gesture_source_type) const {
   return gesture_source_type == SyntheticGestureParams::TOUCH_INPUT ||
       gesture_source_type == SyntheticGestureParams::MOUSE_INPUT;
 }
 
 int SyntheticGestureTargetAura::GetTouchSlopInDips() const {
   // - 1 because Aura considers a pointer to be moving if it has moved at least
   // 'max_touch_move_in_pixels_for_click' pixels.
   return ui::GestureConfiguration::max_touch_move_in_pixels_for_click() - 1;
 }
 
+aura::Window* SyntheticGestureTargetAura::GetWindow() const {
+  aura::Window* window = render_widget_host()->GetView()->GetNativeView();
+  DCHECK(window);
+  return window;
+}
+
 aura::RootWindowHostDelegate*
 SyntheticGestureTargetAura::GetRootWindowHostDelegate() const {
-  aura::Window* window = render_widget_host()->GetView()->GetNativeView();
-  aura::Window* root_window = window->GetRootWindow();
+  aura::Window* root_window = GetWindow()->GetRootWindow();
   aura::RootWindowHostDelegate* root_window_host_delegate =
       root_window->GetDispatcher()->AsRootWindowHostDelegate();
   DCHECK(root_window_host_delegate);
   return root_window_host_delegate;
 }
 
+aura::client::ScreenPositionClient*
+SyntheticGestureTargetAura::GetScreenPositionClient() const {
+  aura::Window* root_window = GetWindow()->GetRootWindow();
+  aura::client::ScreenPositionClient* position_client =
+      aura::client::GetScreenPositionClient(root_window);
+  DCHECK(position_client);
+  return position_client;
+}
 
 }  // namespace content