Translate 1 pixel not 1 dip when rotating the display.

ash/display/display_controller_unittest.cc

 // Copyright (c) 2012 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 "ash/display/display_controller.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
@@ skipping 92 matching lines @@
   TestEventHandler() : target_root_(NULL),
                        touch_radius_x_(0.0),
                        touch_radius_y_(0.0),
                        scroll_x_offset_(0.0),
                        scroll_y_offset_(0.0),
                        scroll_x_offset_ordinal_(0.0),
                        scroll_y_offset_ordinal_(0.0) {}
   virtual ~TestEventHandler() {}
 
   virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+    if (event->flags() & ui::EF_IS_SYNTHESIZED)
+      return;
     aura::Window* target = static_cast<aura::Window*>(event->target());
-    // Only record when the target is the background which covers
-    // entire root window.
-    if (target->name() != kDesktopBackgroundView)
-      return;
-    mouse_location_ = event->location();
+    mouse_location_ = event->root_location();
     target_root_ = target->GetRootWindow();
     event->StopPropagation();
   }
 
   virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     aura::Window* target = static_cast<aura::Window*>(event->target());
     // Only record when the target is the background which covers
     // entire root window.
     if (target->name() != kDesktopBackgroundView)
       return;
@@ skipping 47 matching lines @@
 };
 
 gfx::Display::Rotation GetStoredRotation(int64 id) {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(id).rotation();
 }
 
 float GetStoredUIScale(int64 id) {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(id).ui_scale();
 }
 
+void MoveMouseToInHostCoord(aura::RootWindow* root_window,
+                            int host_x,
+                            int host_y) {
+  gfx::Point move_point(host_x, host_y);
+  ui::MouseEvent mouseev(ui::ET_MOUSE_MOVED, move_point, move_point, 0);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouseev);
+}
+
 }  // namespace
 
 typedef test::AshTestBase DisplayControllerTest;
 
 TEST_F(DisplayControllerShutdownTest, Shutdown) {
   UpdateDisplay("444x333, 200x200");
 }
 
 TEST_F(DisplayControllerTest, SecondaryDisplayLayout) {
   TestObserver observer;
@@ skipping 217 matching lines @@
   EXPECT_EQ("right, 50",
             display_controller->GetCurrentDisplayLayout().ToString());
 
   // Switch primary and secondary
   display_controller->SetPrimaryDisplay(secondary_display);
   const DisplayLayout& inverted_layout =
       display_controller->GetCurrentDisplayLayout();
   EXPECT_EQ("left, -50", inverted_layout.ToString());
 
   EXPECT_EQ(secondary_display.id(),
-      Shell::GetScreen()->GetPrimaryDisplay().id());
+            Shell::GetScreen()->GetPrimaryDisplay().id());
   EXPECT_EQ(primary_display.id(), ScreenAsh::GetSecondaryDisplay().id());
   EXPECT_EQ(secondary_display.id(),
             Shell::GetScreen()->GetDisplayNearestPoint(
                 gfx::Point(-100, -100)).id());
   EXPECT_EQ(secondary_display.id(),
             Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
 
   EXPECT_EQ(
       primary_root,
       display_controller->GetRootWindowForDisplayId(secondary_display.id()));
@@ skipping 285 matching lines @@
   EXPECT_EQ("30,20", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 #if defined(OS_WIN)
 // On Win8 bots, the host window can't be resized and
 // SetTransform updates the window using the orignal host window
 // size.
 #define MAYBE_Rotate DISABLED_Rotate
+#define MAYBE_ScaleRootWindow DISABLED_ScaleRootWindow
+#define MAYBE_TouchScale DISABLED_TouchScale
+#define MAYBE_ConvertHostToRootCoords DISABLED_ConvertHostToRootCoords
 #else
 #define MAYBE_Rotate Rotate
+#define MAYBE_ScaleRootWindow ScaleRootWindow
+#define MAYBE_TouchScale TouchScale
+#define MAYBE_ConvertHostToRootCoords ConvertHostToRootCoords
 #endif
 
 TEST_F(DisplayControllerTest, MAYBE_Rotate) {
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   internal::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
@@ skipping 50 matching lines @@
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_180, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_270, GetStoredRotation(display2_id));
 
   generator1.MoveMouseTo(50, 40);
   EXPECT_EQ("69,159", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
-#if defined(OS_WIN)
-// On Win8 bots, the host window can't be resized and
-// SetTransform updates the window using the orignal host window
-// size.
-#define MAYBE_ScaleRootWindow DISABLED_ScaleRootWindow
-#else
-#define MAYBE_ScaleRootWindow ScaleRootWindow
-#endif
-
 TEST_F(DisplayControllerTest, MAYBE_ScaleRootWindow) {
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2@1.5,500x300");
 
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display display2 = ScreenAsh::GetSecondaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 450x300", display1.bounds().ToString());
@@ skipping 13 matching lines @@
   display2 = ScreenAsh::GetSecondaryDisplay();
   EXPECT_EQ("0,0 375x250", display1.bounds().ToString());
   EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString());
   EXPECT_EQ("375,0 500x300", display2.bounds().ToString());
   EXPECT_EQ(1.25f, GetStoredUIScale(display1.id()));
   EXPECT_EQ(1.0f, GetStoredUIScale(display2.id()));
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
-
-#if defined(OS_WIN)
-// On Win8 bots, the host window can't be resized and
-// SetTransform updates the window using the orignal host window
-// size.
-#define MAYBE_TouchScale DISABLED_TouchScale
-#else
-#define MAYBE_TouchScale TouchScale
-#endif
-
 TEST_F(DisplayControllerTest, MAYBE_TouchScale) {
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("200x200*2");
   gfx::Display display = Shell::GetScreen()->GetPrimaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   aura::RootWindow* root_window = root_windows[0];
   aura::test::EventGenerator generator(root_window);
 
   generator.PressMoveAndReleaseTouchTo(50, 50);
   // Default test touches have radius_x/y = 1.0, with device scale
   // factor = 2, the scaled radius_x/y should be 0.5.
   EXPECT_EQ(0.5, event_handler.touch_radius_x());
   EXPECT_EQ(0.5, event_handler.touch_radius_y());
 
   generator.ScrollSequence(gfx::Point(0,0),
                            base::TimeDelta::FromMilliseconds(100),
                            10.0, 1.0, 5, 1);
 
   // With device scale factor = 2, ordinal_offset * 2 = offset.
   EXPECT_EQ(event_handler.scroll_x_offset(),
             event_handler.scroll_x_offset_ordinal() * 2);
   EXPECT_EQ(event_handler.scroll_y_offset(),
             event_handler.scroll_y_offset_ordinal() * 2);
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
+TEST_F(DisplayControllerTest, MAYBE_ConvertHostToRootCoords) {
+  TestEventHandler event_handler;
+  Shell::GetInstance()->AddPreTargetHandler(&event_handler);
+
+  UpdateDisplay("600x400*2/r@1.5");
+
+  gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  EXPECT_EQ("0,0 300x450", display1.bounds().ToString());
+  EXPECT_EQ("0,0 300x450", root_windows[0]->bounds().ToString());
+  EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
+
+  MoveMouseToInHostCoord(root_windows[0], 0, 0);
+  EXPECT_EQ("0,449", event_handler.GetLocationAndReset());
+  MoveMouseToInHostCoord(root_windows[0], 599, 0);
+  EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
+  MoveMouseToInHostCoord(root_windows[0], 599, 399);
+  EXPECT_EQ("299,0", event_handler.GetLocationAndReset());
+  MoveMouseToInHostCoord(root_windows[0], 0, 399);
+  EXPECT_EQ("299,449", event_handler.GetLocationAndReset());
+
+  Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
+}
+
 }  // namespace test
 }  // namespace ash