Always update cursor visibility

ash/display/cursor_window_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/cursor_window_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 class CursorWindowControllerTest : public test::AshTestBase {
  public:
   CursorWindowControllerTest() {}
   ~CursorWindowControllerTest() override {}
 
   // test::AshTestBase:
   void SetUp() override {
     AshTestBase::SetUp();
-    cursor_window_controller_ =
-        Shell::GetInstance()->display_controller()->cursor_window_controller();
-    cursor_window_controller_->SetCursorCompositingEnabled(true);
+    SetCursorCompositionEnabled(true);
   }
 
   int GetCursorType() const { return cursor_window_controller_->cursor_type_; }
 
   const gfx::Point& GetCursorHotPoint() const {
     return cursor_window_controller_->hot_point_;
   }
 
   aura::Window* GetCursorWindow() const {
     return cursor_window_controller_->cursor_window_.get();
   }
 
   int64 GetCursorDisplayId() const {
     return cursor_window_controller_->display_.id();
   }
 
+  void SetCursorCompositionEnabled(bool enabled) {
+    cursor_window_controller_ =
+        Shell::GetInstance()->display_controller()->cursor_window_controller();
+    cursor_window_controller_->SetCursorCompositingEnabled(enabled);
+  }
+
  private:
   // Not owned.
   CursorWindowController* cursor_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowControllerTest);
 };
 
 // Test that the composited cursor moves to another display when the real cursor
 // moves to another display.
 TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) {
@@ skipping 41 matching lines @@
   EXPECT_TRUE(secondary_root->Contains(GetCursorWindow()));
   EXPECT_EQ(secondary_display_id, GetCursorDisplayId());
   EXPECT_EQ(ui::kCursorNull, GetCursorType());
   hot_point = GetCursorHotPoint();
   EXPECT_EQ("8,9", hot_point.ToString());
   cursor_bounds = GetCursorWindow()->GetBoundsInScreen();
   EXPECT_EQ(220, cursor_bounds.x() + hot_point.x());
   EXPECT_EQ(50, cursor_bounds.y() + hot_point.y());
 }
 
+// Make sure that composition cursor inherits the visibility state.
+TEST_F(CursorWindowControllerTest, VisibilityTest) {
+  ASSERT_TRUE(GetCursorWindow());
+  EXPECT_TRUE(GetCursorWindow()->IsVisible());
+  aura::client::CursorClient* client = Shell::GetInstance()->cursor_manager();
+  client->HideCursor();
+  ASSERT_TRUE(GetCursorWindow());
+  EXPECT_FALSE(GetCursorWindow()->IsVisible());
+
+  // Normal cursor should be in the correct state.
+  SetCursorCompositionEnabled(false);
+  ASSERT_FALSE(GetCursorWindow());
+  ASSERT_FALSE(client->IsCursorVisible());
+
+  // Cursor was hidden.
+  SetCursorCompositionEnabled(true);
+  ASSERT_TRUE(GetCursorWindow());
+  EXPECT_FALSE(GetCursorWindow()->IsVisible());
+
+  // Goback to normal cursor and show the cursor.
+  SetCursorCompositionEnabled(false);
+  ASSERT_FALSE(GetCursorWindow());
+  ASSERT_FALSE(client->IsCursorVisible());
+  client->ShowCursor();
+  ASSERT_TRUE(client->IsCursorVisible());
+
+  // Cursor was shown.
+  SetCursorCompositionEnabled(true);
+  ASSERT_TRUE(GetCursorWindow());
+  EXPECT_TRUE(GetCursorWindow()->IsVisible());
+}
+
 }  // namespace ash