Make cursor highlighting feature work across multiple displays

chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc

 // Copyright (c) 2010 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/window_tree_host_manager.h"
+#include "ash/shell.h"
+#include "ash/test/ash_test_base.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.h"
+#include "chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.h"
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
-
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/display/screen.h"
+#include "ui/events/event.h"
+#include "ui/events/event_utils.h"
 
 namespace chromeos {
 
 class TestableAccessibilityFocusRingController
     : public AccessibilityFocusRingController {
  public:
   TestableAccessibilityFocusRingController() {
     // By default use an easy round number for testing.
     margin_ = 10;
   }
   ~TestableAccessibilityFocusRingController() override {}
 
   void RectsToRings(const std::vector<gfx::Rect>& rects,
                     std::vector<AccessibilityFocusRing>* rings) const {
     AccessibilityFocusRingController::RectsToRings(rects, rings);
   }
 
   int GetMargin() const override { return margin_; }
 
  private:
   int margin_;
 };
 
-class AccessibilityFocusRingControllerTest : public testing::Test {
+class AccessibilityFocusRingControllerTest : public ash::test::AshTestBase {
  public:
   AccessibilityFocusRingControllerTest() {}
   ~AccessibilityFocusRingControllerTest() override {}
 
  protected:
   gfx::Rect AddMargin(gfx::Rect r) {
     r.Inset(-controller_.GetMargin(), -controller_.GetMargin());
     return r;
   }
 
@@ skipping 79 matching lines @@
   EXPECT_EQ(gfx::Point(10, 400), points[28]);
   EXPECT_EQ(gfx::Point(0, 400), points[29]);
   EXPECT_EQ(gfx::Point(0, 390), points[30]);
   EXPECT_EQ(gfx::Point(0, 110), points[31]);
   EXPECT_EQ(gfx::Point(0, 100), points[32]);
   EXPECT_EQ(gfx::Point(0, 100), points[33]);
   EXPECT_EQ(gfx::Point(0, 100), points[34]);
   EXPECT_EQ(gfx::Point(0, 100), points[35]);
 }
 
+TEST_F(AccessibilityFocusRingControllerTest, CursorWorksOnMultipleDisplays) {
+  if (!SupportsMultipleDisplays())
+    return;
+  UpdateDisplay("400x400,500x500");
+  std::vector<display::Display> displays =
+      display::Screen::GetScreen()->GetAllDisplays();
+  ASSERT_EQ(2u, displays.size());
+  auto* manager = ash::Shell::GetInstance()->window_tree_host_manager();
+  aura::Window* root_window0 =
+      manager->GetRootWindowForDisplayId(displays[0].id());
+  aura::Window* root_window1 =
+      manager->GetRootWindowForDisplayId(displays[1].id());

[oshima, 2016/10/19 21:13:51]

you can use Shell::GetAllRootWindows()

[dmazzoni, 2016/10/19 22:36:49]

Thanks, that's simpler.

+  LOG(ERROR) << root_window0;
+  LOG(ERROR) << root_window1;

[oshima, 2016/10/19 21:13:51]

nit: remove debug logs.

[dmazzoni, 2016/10/19 22:36:49]

Done.

+
+  AccessibilityHighlightManager highlight_manager;
+  highlight_manager.HighlightCursor(true);
+  gfx::Point location(90, 90);
+  std::unique_ptr<ui::MouseEvent> event(new ui::MouseEvent(
+      ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(), 0, 0));

[oshima, 2016/10/19 21:13:51]

you can just create a instance on a stack.

[dmazzoni, 2016/10/19 22:36:49]

Done.

+  ui::Event::DispatcherApi event_mod(event.get());
+  event_mod.set_target(root_window0);
+  highlight_manager.OnMouseEvent(event.get());
+
+  AccessibilityFocusRingController* controller =
+      AccessibilityFocusRingController::GetInstance();
+  AccessibilityCursorRingLayer* cursor_layer = controller->cursor_layer_.get();
+  EXPECT_EQ(root_window0, cursor_layer->root_window());
+  EXPECT_LT(abs(cursor_layer->layer()->GetTargetBounds().x() - location.x()),
+            50);
+  EXPECT_LT(abs(cursor_layer->layer()->GetTargetBounds().y() - location.y()),
+            50);
+
+  std::unique_ptr<ui::MouseEvent> event1(new ui::MouseEvent(
+      ui::ET_MOUSE_MOVED, location, location, ui::EventTimeForNow(), 0, 0));
+  ui::Event::DispatcherApi event_mod1(event.get());
+  event_mod1.set_target(root_window1);
+  highlight_manager.OnMouseEvent(event.get());
+
+  cursor_layer = controller->cursor_layer_.get();
+  EXPECT_EQ(root_window1, cursor_layer->root_window());
+  EXPECT_LT(abs(cursor_layer->layer()->GetTargetBounds().x() - location.x()),
+            50);
+  EXPECT_LT(abs(cursor_layer->layer()->GetTargetBounds().y() - location.y()),
+            50);
+}
+
 }  // namespace chromeos