[views-mus] Support custom cursors.

services/ui/ws/server_window.h

Index: services/ui/ws/server_window.h
diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
index 3a7fa5a5ec4330804a61e6dfe3bc96cbc5eb9817..4ae36d062503c52e857e70286bc94178e53456cb 100644
--- a/services/ui/ws/server_window.h
+++ b/services/ui/ws/server_window.h
@@ -105,10 +105,8 @@ class ServerWindow {
   bool can_accept_drops() const { return accepts_drops_; }
   void SetCanAcceptDrops(bool accepts_drags);
 
-  ui::mojom::CursorType cursor() const { return cursor_id_; }
-  ui::mojom::CursorType non_client_cursor() const {
-    return non_client_cursor_id_;
-  }
+  const ui::CursorData& cursor() const { return cursor_; }
+  const ui::CursorData& non_client_cursor() const { return non_client_cursor_; }
 
   const ServerWindow* parent() const { return parent_; }
   ServerWindow* parent() { return parent_; }
@@ -151,8 +149,8 @@ class ServerWindow {
   float opacity() const { return opacity_; }
   void SetOpacity(float value);
 
-  void SetPredefinedCursor(ui::mojom::CursorType cursor_id);
-  void SetNonClientCursor(ui::mojom::CursorType cursor_id);
+  void SetCursor(const ui::CursorData& cursor);

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

Should these two functions take a ui::CursorData that is std::move()d? If you
don't do that, aren't you potentially doing unnecessary copying of the bitmaps?

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

Done.

(A previous version of this patch actually did this, but I undid it because I
was confused about the observer interfaces.)

+  void SetNonClientCursor(const ui::CursorData& cursor);
 
   const gfx::Transform& transform() const { return transform_; }
   void SetTransform(const gfx::Transform& transform);
@@ -252,8 +250,8 @@ class ServerWindow {
   std::vector<gfx::Rect> additional_client_areas_;
   std::unique_ptr<ServerWindowCompositorFrameSinkManager>
       compositor_frame_sink_manager_;
-  mojom::CursorType cursor_id_;
-  mojom::CursorType non_client_cursor_id_;
+  ui::CursorData cursor_;
+  ui::CursorData non_client_cursor_;
   float opacity_;
   bool can_focus_;
   mojom::EventTargetingPolicy event_targeting_policy_ =