Implement cursor compositing mode on Ash

ash/display/display_controller.h

 // Copyright (c) 2012 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 ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 20 matching lines @@
 template <typename T> class JSONValueConverter;
 }
 
 namespace gfx {
 class Display;
 class Insets;
 }
 
 namespace ash {
 namespace internal {
+class CursorWindowController;
 class DisplayInfo;
 class DisplayManager;
 class FocusActivationStore;
 class MirrorWindowController;
 class RootWindowController;
 class VirtualKeyboardWindowController;
 }
 
 // DisplayController owns and maintains RootWindows for each attached
 // display, keeping them in sync with display configuration changes.
@@ skipping 18 matching lines @@
   DisplayController();
   virtual ~DisplayController();
 
   void Start();
   void Shutdown();
 
   // Returns primary display's ID.
   // TODO(oshima): Move this out from DisplayController;
   static int64 GetPrimaryDisplayId();
 
+  internal::CursorWindowController* cursor_window_controller() {
+    return cursor_window_controller_.get();
+  }
+
   internal::MirrorWindowController* mirror_window_controller() {
     return mirror_window_controller_.get();
   }
 
   internal::VirtualKeyboardWindowController*
       virtual_keyboard_window_controller() {
     return virtual_keyboard_window_controller_.get();
   }
 
   // Initializes primary display.
@@ skipping 11 matching lines @@
 
   // Returns the root window for |display_id|.
   aura::Window* GetRootWindowForDisplayId(int64 id);
 
   // Toggle mirror mode.
   void ToggleMirrorMode();
 
   // Swap primary and secondary display.
   void SwapPrimaryDisplay();
 
+  // Enable/Disable cursor compositing.
+  void SetCursorCompositingEnabled(bool enabled);
+
+  // Sets the display on which to draw cursor.
+  // Only applicable when cursor compositing is enabled.
+  void SetDisplayForCursor(const gfx::Display& display);
+
   // Sets the ID of the primary display.  If the display is not connected, it
   // will switch the primary display when connected.
   void SetPrimaryDisplayId(int64 id);
 
   // Sets primary display. This re-assigns the current root
   // window to given |display|.
   void SetPrimaryDisplay(const gfx::Display& display);
 
   // Closes all child windows in the all root windows.
   void CloseChildWindows();
@@ skipping 41 matching lines @@
   friend class internal::MirrorWindowController;
 
   // Creates a root window for |display| and stores it in the |root_windows_|
   // map.
   aura::RootWindow* AddRootWindowForDisplay(const gfx::Display& display);
 
   void OnFadeOutForSwapDisplayFinished();
 
   void UpdateHostWindowNames();
 
+  void UpdateCursorWindowContainer();
+
   class DisplayChangeLimiter {
    public:
     DisplayChangeLimiter();
 
     // Sets how long the throttling should last.
     void SetThrottleTimeout(int64 throttle_ms);
 
     bool IsThrottled() const;
 
    private:
     // The time when the throttling ends.
     base::Time throttle_timeout_;
 
     DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
   };
 
   // The limiter to throttle how fast a user can
   // change the display configuration.
   scoped_ptr<DisplayChangeLimiter> limiter_;
 
   // The mapping from display ID to its root window.
   std::map<int64, aura::Window*> root_windows_;
 
   ObserverList<Observer> observers_;
 
   // Store the primary root window temporarily while replacing
   // display.
   aura::Window* primary_root_window_for_replace_;
 
+  bool is_cursor_compositing_enabled_;

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

looks to me that this can and probably should be in CursorWindowController?

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

Done.

+
   scoped_ptr<internal::FocusActivationStore> focus_activation_store_;
 
+  scoped_ptr<internal::CursorWindowController> cursor_window_controller_;
   scoped_ptr<internal::MirrorWindowController> mirror_window_controller_;
   scoped_ptr<internal::VirtualKeyboardWindowController>
       virtual_keyboard_window_controller_;
 
   // Stores the curent cursor location (in native coordinates) used to
   // restore the cursor location when display configuration
   // changed.
   gfx::Point cursor_location_in_native_coords_for_restore_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_