[views-mus] Support custom cursors.

services/ui/ws/window_tree.cc

 // Copyright 2014 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 "services/ui/ws/window_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 880 matching lines @@
     return;
 
   ClientWindowId client_window_id;
   if (IsWindowKnown(window, &client_window_id)) {
     client()->OnWindowOpacityChanged(client_window_id.id, old_opacity,
                                      new_opacity);
   }
 }
 
 void WindowTree::ProcessCursorChanged(const ServerWindow* window,
-                                      mojom::CursorType cursor_id,
+                                      const ui::CursorData& cursor,
                                       bool originated_change) {
   if (originated_change)
     return;
   ClientWindowId client_window_id;
   if (!IsWindowKnown(window, &client_window_id))
     return;
 
-  client()->OnWindowPredefinedCursorChanged(client_window_id.id, cursor_id);
+  client()->OnWindowCursorChanged(client_window_id.id, cursor);
 }
 
 void WindowTree::ProcessFocusChanged(const ServerWindow* old_focused_window,
                                      const ServerWindow* new_focused_window) {
   if (window_server_->current_operation_type() == OperationType::SET_FOCUS &&
       window_server_->IsOperationSource(id_)) {
     return;
   }
   const ServerWindow* window =
       new_focused_window
@@ skipping 846 matching lines @@
 
 void WindowTree::SetEventTargetingPolicy(Id transport_window_id,
                                          mojom::EventTargetingPolicy policy) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   // TODO(riajiang): check |event_queue_| is empty for |window|.
   if (window && access_policy_->CanSetEventTargetingPolicy(window))
     window->set_event_targeting_policy(policy);
 }
 
-void WindowTree::SetPredefinedCursor(uint32_t change_id,
-                                     Id transport_window_id,
-                                     ui::mojom::CursorType cursor_id) {
+void WindowTree::SetCursor(uint32_t change_id,
+                           Id transport_window_id,
+                           ui::CursorData cursor) {
   ServerWindow* window =

[sky, 2017/04/26 22:16:16]

Should this fail if cursor type is custom and cursor_frames is empty?

[Elliot Glaysher, 2017/04/26 23:09:04]

Changed this method to do lots of validation with more of the DVLOGs you love.

[sky, 2017/04/26 23:35:01]

I think you meant *love* :)
Seriously though, I have found the DVLOGs some what helpful in tracking down
random failures. Hopefully I'm not the only one...

       GetWindowByClientId(ClientWindowId(transport_window_id));
 
   // Only the owner of the window can change the bounds.
   bool success = window && access_policy_->CanSetCursorProperties(window);
   if (success) {
     Operation op(this, window_server_,
                  OperationType::SET_WINDOW_PREDEFINED_CURSOR);
-    window->SetPredefinedCursor(cursor_id);
+    window->SetCursor(cursor);
   }
   client()->OnChangeCompleted(change_id, success);
 }
 
 void WindowTree::DeactivateWindow(Id window_id) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(window_id));
   if (!window) {
     DVLOG(1) << "DeactivateWindow failed (invalid id)";
     return;
@@ skipping 427 matching lines @@
   // TODO(sky): think about what else case means.
 }
 
 void WindowTree::WmSetFrameDecorationValues(
     mojom::FrameDecorationValuesPtr values) {
   DCHECK(window_manager_state_);
   window_manager_state_->SetFrameDecorationValues(std::move(values));
 }
 
 void WindowTree::WmSetNonClientCursor(uint32_t window_id,
-                                      mojom::CursorType cursor_id) {
+                                      ui::CursorData cursor) {
   DCHECK(window_manager_state_);
   ServerWindow* window = GetWindowByClientId(ClientWindowId(window_id));
   if (window) {
-    window->SetNonClientCursor(cursor_id);
+    window->SetNonClientCursor(cursor);
   } else {
     DVLOG(1) << "trying to update non-client cursor of invalid window";
   }
 }
 
 void WindowTree::OnWmCreatedTopLevelWindow(uint32_t change_id,
                                            Id transport_window_id) {
   ServerWindow* window =
       GetWindowByClientId(ClientWindowId(transport_window_id));
   if (window && window->id().client_id != id_) {
@@ skipping 168 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui