Implement cursor compositing mode on Ash

ash/display/mirror_window_controller.h

Index: ash/display/mirror_window_controller.h
diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h
index 86773f18eec6bb44ef9d0e3b8e2d68512ae12649..6b63c279f8a78eccef16901811c6bf3f22ed8e2d 100644
--- a/ash/display/mirror_window_controller.h
+++ b/ash/display/mirror_window_controller.h
@@ -31,15 +31,15 @@ class MirrorWindowTestApi;
 }
 
 namespace internal {
+class CursorWindowController;
 class DisplayInfo;
-class CursorWindowDelegate;
 
 // An object that copies the content of the primary root window to a
 // mirror window. This also draws a mouse cursor as the mouse cursor
 // is typically drawn by the window system.
 class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver {
  public:
-  MirrorWindowController();
+  MirrorWindowController(CursorWindowController* cursor_window_controller);
   virtual ~MirrorWindowController();
 
   // Updates the root window's bounds using |display_info|.
@@ -53,15 +53,12 @@ class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver {
   // Close the mirror window.
   void Close();
 
-  // Updates the mirrored cursor location,shape and
-  // visibility.
-  void UpdateCursorLocation();
-  void SetMirroredCursor(gfx::NativeCursor cursor);
-  void SetMirroredCursorVisibility(bool visible);
-
   // aura::RootWindowObserver overrides:
   virtual void OnWindowTreeHostResized(const aura::RootWindow* root) OVERRIDE;
 
+  // Returns the mirror root window.
+  aura::RootWindow* root_window() const { return root_window_.get(); }
+
  private:
   friend class test::MirrorWindowTestApi;
 
@@ -69,12 +66,10 @@ class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver {
   // configuration.
   scoped_ptr<aura::RootWindowTransformer> CreateRootWindowTransformer() const;
 
-  int current_cursor_type_;
-  gfx::Display::Rotation current_cursor_rotation_;
-  aura::Window* cursor_window_;  // owned by root window.
+  // Owned by display controller and outlives mirror window controller.
+  CursorWindowController* cursor_window_controller_;

[oshima, 2014/02/05 21:49:59]

Can you simply access through DisplayController instead?

[hshi1, 2014/02/05 22:55:58]

Done.

+
   scoped_ptr<aura::RootWindow> root_window_;
-  scoped_ptr<CursorWindowDelegate> cursor_window_delegate_;
-  gfx::Point hot_point_;
   gfx::Size mirror_window_host_size_;
   scoped_refptr<ui::Reflector> reflector_;