Remote assistance on Chrome OS Part IX - Input injection on Ozone

remoting/host/input_injector_x11.cc

Index: remoting/host/input_injector_x11.cc
diff --git a/remoting/host/input_injector_x11.cc b/remoting/host/input_injector_x11.cc
index 3b5d2b46922014716fd862676de4a6c3f9c6ebd2..1852e9fabc50ab43f2b8ca516d3e752f3674eb7c 100644
--- a/remoting/host/input_injector_x11.cc
+++ b/remoting/host/input_injector_x11.cc
@@ -18,6 +18,9 @@
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "remoting/base/logging.h"
+#if defined(OS_CHROMEOS)
+#include "remoting/host/chromeos/point_transformer.h"
+#endif
 #include "remoting/host/clipboard.h"
 #include "remoting/host/linux/unicode_to_keysym.h"
 #include "remoting/proto/internal.pb.h"
@@ -171,6 +174,10 @@ class InputInjectorX11 : public InputInjector {
 
     int pointer_button_map_[kNumPointerButtons];
 
+#if defined(OS_CHROMEOS)
+    PointTransformer point_transformer_;
+#endif
+
     scoped_ptr<Clipboard> clipboard_;
 
     bool saved_auto_repeat_enabled_;
@@ -401,8 +408,15 @@ void InputInjectorX11::Core::InjectMouseEvent(const MouseEvent& event) {
     // a MotionNotify even if the mouse position hasn't changed, which confuses
     // apps which assume MotionNotify implies movement. See crbug.com/138075.
     bool inject_motion = true;
-    webrtc::DesktopVector new_mouse_position(
-        webrtc::DesktopVector(event.x(), event.y()));
+    webrtc::DesktopVector new_mouse_position(event.x(), event.y());
+#if defined(OS_CHROMEOS)
+    // Interim hack to handle display rotation on Chrome OS.
+    // TODO(kelvin): Remove this when Chrome OS has completely migrated to
+    // Ozone (crbug.com/439287).
+    gfx::PointF screen_location = point_transformer_.ToScreenCoordinates(
+        gfx::PointF(event.x(), event.y()));
+    new_mouse_position.set(screen_location.x(), screen_location.y());
+#endif
     if (event.has_button() && event.has_button_down() && !event.button_down()) {
       if (new_mouse_position.equals(latest_mouse_position_))
         inject_motion = false;