Add {Lock,Unlock,Show,Hide}Cursor() to the window manager mojom.

services/ui/ws/display_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "services/ui/common/types.h"
 #include "services/ui/common/util.h"
 #include "services/ui/display/viewport_metrics.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/test_utils.h"
 #include "services/ui/ws/window_manager_display_root.h"
 #include "services/ui/ws/window_manager_state.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ui {
 namespace ws {
 namespace test {
 namespace {
 
 const UserId kTestId1 = "2";
@@ skipping 58 matching lines @@
   ~DisplayTest() override {}
 
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
   DisplayManager* display_manager() {
     return window_server()->display_manager();
   }
   TestWindowServerDelegate* window_server_delegate() {
     return ws_test_helper_.window_server_delegate();
   }
   TestScreenManager& screen_manager() { return screen_manager_; }
+  const ui::CursorData& cursor() { return ws_test_helper_.cursor(); }
 
  protected:
   // testing::Test:
   void SetUp() override {
     screen_manager_.Init(window_server()->display_manager());
     window_server()->user_id_tracker()->AddUserId(kTestId1);
     window_server()->user_id_tracker()->AddUserId(kTestId2);
   }
 
  private:
@@ skipping 305 matching lines @@
   // The window should still be valid on the server side.
   ASSERT_TRUE(tree->GetWindowByClientId(secondary_root_id));
   // No changes.
   ASSERT_EQ(0u, tree_client->tracker()->changes()->size());
 
   // The window should be destroyed when the client says so.
   ASSERT_TRUE(tree->DeleteWindow(secondary_root_id));
   EXPECT_TRUE(secondary_root_destroyed);
 }
 
+TEST_F(DisplayTest, CursorLockTest) {
+  AddWindowManager(window_server(), kTestId1);
+  const int64_t display_id =
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
+
+  ASSERT_EQ(1u, display_manager()->displays().size());
+  Display* display = display_manager()->GetDisplayById(display_id);
+
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kWait));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->LockCursor();
+
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kCell));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->UnlockCursor();
+
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kCell));
+}
+
+TEST_F(DisplayTest, CursorVisibilityTest) {
+  AddWindowManager(window_server(), kTestId1);
+  const int64_t display_id =
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
+
+  ASSERT_EQ(1u, display_manager()->displays().size());
+  Display* display = display_manager()->GetDisplayById(display_id);
+
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kWait));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->HideCursor();
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kNone));
+
+  display->ShowCursor();
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->HideCursor();
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kCell));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kNone));
+
+  display->ShowCursor();
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kCell));
+}
+
+TEST_F(DisplayTest, CursorOverrideTest) {
+  AddWindowManager(window_server(), kTestId1);
+  const int64_t display_id =
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
+
+  ASSERT_EQ(1u, display_manager()->displays().size());
+  Display* display = display_manager()->GetDisplayById(display_id);
+
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kWait));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->SetGlobalOverrideCursor(ui::CursorData(ui::CursorType::kCell));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kCell));
+
+  display->SetGlobalOverrideCursor(base::nullopt);
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+}
+
+TEST_F(DisplayTest, CursorOverrideLockTest) {
+  // This test is meant to mimic the calls in ScreenshotController when it sets
+  // a cursor.
+  AddWindowManager(window_server(), kTestId1);
+  const int64_t display_id =
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
+
+  ASSERT_EQ(1u, display_manager()->displays().size());
+  Display* display = display_manager()->GetDisplayById(display_id);
+
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kWait));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->SetGlobalOverrideCursor(ui::CursorData(ui::CursorType::kCross));
+  display->LockCursor();
+  display->SetGlobalOverrideCursor(base::nullopt);
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kCross));
+
+  display->UnlockCursor();
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+}
+
+TEST_F(DisplayTest, CursorOverrideVisibilityTest) {
+  // This test is meant to mimic the calls in ScreenshotController when it
+  // hides the cursor.
+  AddWindowManager(window_server(), kTestId1);
+  const int64_t display_id =
+      screen_manager().AddDisplay(MakeDisplay(0, 0, 1024, 768, 1.0f));
+
+  ASSERT_EQ(1u, display_manager()->displays().size());
+  Display* display = display_manager()->GetDisplayById(display_id);
+
+  display->UpdateNativeCursor(ui::CursorData(ui::CursorType::kWait));
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+
+  display->HideCursor();
+  display->LockCursor();
+  display->SetGlobalOverrideCursor(base::nullopt);
+  display->ShowCursor();
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kNone));
+
+  display->UnlockCursor();
+  EXPECT_TRUE(cursor().IsType(ui::CursorType::kWait));
+}
+
 }  // namespace test
 }  // namespace ws
 }  // namespace ui