[views-mus] Support custom cursors.

services/ui/ws/server_window.h

 // 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.
 
 #ifndef SERVICES_UI_WS_SERVER_WINDOW_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 87 matching lines @@
   void SetClientArea(const gfx::Insets& insets,
                      const std::vector<gfx::Rect>& additional_client_areas);
 
   const gfx::Rect* hit_test_mask() const { return hit_test_mask_.get(); }
   void SetHitTestMask(const gfx::Rect& mask);
   void ClearHitTestMask();
 
   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_; }
 
   // NOTE: this returns null if the window does not have an ancestor associated
   // with a display.
   const ServerWindow* GetRoot() const;
   ServerWindow* GetRoot() {
     return const_cast<ServerWindow*>(
         const_cast<const ServerWindow*>(this)->GetRoot());
@@ skipping 22 matching lines @@
   bool Contains(const ServerWindow* window) const;
 
   // Returns the visibility requested by this window. IsDrawn() returns whether
   // the window is actually visible on screen.
   bool visible() const { return visible_; }
   void SetVisible(bool value);
 
   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);
 
   const std::map<std::string, std::vector<uint8_t>>& properties() const {
     return properties_;
   }
   void SetProperty(const std::string& name, const std::vector<uint8_t>* value);
 
   std::string GetName() const;
@@ skipping 79 matching lines @@
   ServerWindow* transient_parent_;
   Windows transient_children_;
 
   ModalType modal_type_;
   bool visible_;
   gfx::Rect bounds_;
   gfx::Insets client_area_;
   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_ =
       mojom::EventTargetingPolicy::TARGET_AND_DESCENDANTS;
   gfx::Transform transform_;
   ui::TextInputState text_input_state_;
 
   Properties properties_;
 
   gfx::Vector2d underlay_offset_;
@@ skipping 12 matching lines @@
 
   base::ObserverList<ServerWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindow);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_H_