Unified Desktop: Support 2xDSF display

ash/display/unified_mouse_warp_controller_unittest.cc

 // Copyright 2015 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/unified_mouse_warp_controller.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
@@ skipping 22 matching lines @@
 
   MouseCursorEventFilter* event_filter() {
     return Shell::GetInstance()->mouse_cursor_filter();
   }
 
   UnifiedMouseWarpController* mouse_warp_controller() {
     return static_cast<UnifiedMouseWarpController*>(
         event_filter()->mouse_warp_controller_for_test());
   }
 
+  void BoundaryTestBody(const std::string& displays_with_same_height,
+                        const std::string& displays_with_different_heights) {
+    UpdateDisplay(displays_with_same_height);
+    aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+    // Let the UnifiedMouseWarpController compute the bounds by
+    // generating a mouse move event.
+    GetEventGenerator().MoveMouseTo(gfx::Point(0, 0));
+    EXPECT_EQ("399,0 1x400",
+              mouse_warp_controller()->first_edge_bounds_in_native_.ToString());
+    EXPECT_EQ(
+        "0,450 1x400",
+        mouse_warp_controller()->second_edge_bounds_in_native_.ToString());
+
+    // Scaled.
+    UpdateDisplay(displays_with_different_heights);
+    root_windows = Shell::GetAllRootWindows();
+    // Let the UnifiedMouseWarpController compute the bounds by
+    // generating a mouse move event.
+    GetEventGenerator().MoveMouseTo(gfx::Point(1, 1));
+
+    EXPECT_EQ("399,0 1x400",
+              mouse_warp_controller()->first_edge_bounds_in_native_.ToString());
+    EXPECT_EQ(
+        "0,450 1x600",
+        mouse_warp_controller()->second_edge_bounds_in_native_.ToString());
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(UnifiedMouseWarpControllerTest);
 };
 
 // Verifies if MouseCursorEventFilter's bounds calculation works correctly.
 TEST_F(UnifiedMouseWarpControllerTest, BoundaryTest) {
   if (!SupportsMultipleDisplays())
     return;
 
-  UpdateDisplay("400x400,0+450-700x400");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
-  // Let the UnifiedMouseWarpController compute the bounds by
-  // generating a mouse move event.
-  GetEventGenerator().MoveMouseTo(gfx::Point(0, 0));
-
-  EXPECT_EQ("399,0 1x400",
-            mouse_warp_controller()->first_edge_bounds_in_native_.ToString());
-  EXPECT_EQ("0,450 1x400",
-            mouse_warp_controller()->second_edge_bounds_in_native_.ToString());
-
-  // Scaled.
-  UpdateDisplay("400x400,0+450-700x600");
-  root_windows = Shell::GetAllRootWindows();
-  // Let the UnifiedMouseWarpController compute the bounds by
-  // generating a mouse move event.
-  GetEventGenerator().MoveMouseTo(gfx::Point(1, 1));
-
-  EXPECT_EQ("399,0 1x400",
-            mouse_warp_controller()->first_edge_bounds_in_native_.ToString());
-  EXPECT_EQ("0,450 1x600",
-            mouse_warp_controller()->second_edge_bounds_in_native_.ToString());
-
-  // Shell::GetInstace()->display_manager()
+  {
+    SCOPED_TRACE("1x1");
+    BoundaryTestBody("400x400,0+450-700x400", "400x400,0+450-700x600");
+  }
+  {
+    SCOPED_TRACE("2x1");
+    BoundaryTestBody("400x400*2,0+450-700x400", "400x400*2,0+450-700x600");
+  }
+  {
+    SCOPED_TRACE("1x2");
+    BoundaryTestBody("400x400,0+450-700x400*2", "400x400,0+450-700x600*2");
+  }
+  {
+    SCOPED_TRACE("2x2");
+    BoundaryTestBody("400x400*2,0+450-700x400*2", "400x400*2,0+450-700x600*2");
+  }
 }
 
 // Verifies if the mouse pointer correctly moves to another display in
 // unified desktop mode.
 TEST_F(UnifiedMouseWarpControllerTest, WarpMouse) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("500x500,500x500");
   ASSERT_EQ(1, gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow())
                    ->GetNumDisplays());
 
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 11)));

[oshima, 2015/07/29 20:20:52]

TestIfMouseWarp currently doesn't work with dsf x. I'm working on it.

 
   // Touch the right edge of the first display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(499, 11)));
   EXPECT_EQ("501,11",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Touch the left edge of the second display. Pointer should warp.
   EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(500, 11)));
   EXPECT_EQ("498,11",  // by 2px.
             aura::Env::GetInstance()->last_mouse_location().ToString());
 
   // Touch the left edge of the first display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(0, 11)));
   // Touch the top edge of the first display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 0)));
   // Touch the bottom edge of the first display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 499)));
   // Touch the right edge of the second display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(999, 11)));
   // Touch the top edge of the second display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 0)));
   // Touch the bottom edge of the second display.
   EXPECT_FALSE(TestIfMouseWarpsAt(gfx::Point(11, 499)));
 }
 
 }  // namespace aura