Fixes bugs in cursor handling

services/ui/ws/cursor_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"
@@ skipping 77 matching lines @@
     return w;
   }
 
   void MoveCursorTo(const gfx::Point& p) {
     DisplayManager* display_manager = window_server()->display_manager();
     ASSERT_EQ(1u, display_manager->displays().size());
     Display* display = *display_manager->displays().begin();
     WindowManagerDisplayRoot* active_display_root =
         display->GetActiveWindowManagerDisplayRoot();
     ASSERT_TRUE(active_display_root);
-    static_cast<PlatformDisplayDelegate*>(display)->OnEvent(ui::PointerEvent(
-        ui::MouseEvent(ui::ET_MOUSE_MOVED, p, p, base::TimeTicks(), 0, 0)));
+    static_cast<PlatformDisplayDelegate*>(display)->OnEvent(PointerEvent(
+        MouseEvent(ET_MOUSE_MOVED, p, p, base::TimeTicks(), 0, 0)));
     WindowManagerState* wms = active_display_root->window_manager_state();
     wms->OnEventAck(wms->window_tree(), mojom::EventResult::HANDLED);
   }
 
  private:
   WindowServerTestHelper ws_test_helper_;
   TestScreenManager screen_manager_;
   DISALLOW_COPY_AND_ASSIGN(CursorTest);
 };
 
 TEST_F(CursorTest, ChangeByMouseMove) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
+  win->parent()->SetPredefinedCursor(mojom::Cursor::CELL);
   EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   // Non client area
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
-  // Client area
+  // Client area, which comes from win->parent().
   MoveCursorTo(gfx::Point(25, 25));
-  EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
+  EXPECT_EQ(mojom::Cursor::CELL, cursor());
 }
 
 TEST_F(CursorTest, ChangeByClientAreaChange) {
   ServerWindow* win = BuildServerWindow();
+  win->parent()->SetPredefinedCursor(mojom::Cursor::CROSS);
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
   EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   // Non client area before we move.
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
-  // Changing the client area should cause a change.
+  // Changing the client area should cause a change. The cursor for the client
+  // area comes from root ancestor, which is win->parent().
   win->SetClientArea(gfx::Insets(1, 1), std::vector<gfx::Rect>());
-  EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
+  EXPECT_EQ(mojom::Cursor::CROSS, cursor());
 }
 
 TEST_F(CursorTest, NonClientCursorChange) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
   EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   MoveCursorTo(gfx::Point(15, 15));
@@ skipping 12 matching lines @@
 
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetPredefinedCursor(mojom::Cursor::HELP);
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 }
 
 TEST_F(CursorTest, NonClientToClientByBoundsChange) {
   ServerWindow* win = BuildServerWindow();
+  win->parent()->SetPredefinedCursor(mojom::Cursor::COPY);
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
   EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   // Non client area before we move.
   MoveCursorTo(gfx::Point(15, 15));
   EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetBounds(gfx::Rect(0, 0, 30, 30));
-  EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
+  EXPECT_EQ(mojom::Cursor::COPY, cursor());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui