exo: Fix multi-display hardware cursor

components/exo/wm_helper.h

 // Copyright 2016 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 COMPONENTS_EXO_WM_HELPER_H_
 #define COMPONENTS_EXO_WM_HELPER_H_
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/base/cursor/cursor.h"
 
 namespace aura {
 class Window;
 }
 
 namespace display {
+class Display;
 class ManagedDisplayInfo;
 }
 
 namespace ui {
 class EventHandler;
 }
 
 namespace exo {
 
 // A helper class for accessing WindowManager related features.
@@ skipping 14 matching lines @@
                                  aura::Window* lost_focus) = 0;
 
    protected:
     virtual ~FocusObserver() {}
   };
 
   class CursorObserver {
    public:
     virtual void OnCursorVisibilityChanged(bool is_visible) {}
     virtual void OnCursorSetChanged(ui::CursorSetType cursor_set) {}
+    virtual void OnCursorDisplayChanging(const display::Display& display) {}
 
    protected:
     virtual ~CursorObserver() {}
   };
 
   class MaximizeModeObserver {
    public:
     virtual void OnMaximizeModeStarted() = 0;
     virtual void OnMaximizeModeEnding() = 0;
     virtual void OnMaximizeModeEnded() = 0;
@@ skipping 30 matching lines @@
   void AddCursorObserver(CursorObserver* observer);
   void RemoveCursorObserver(CursorObserver* observer);
   void AddMaximizeModeObserver(MaximizeModeObserver* observer);
   void RemoveMaximizeModeObserver(MaximizeModeObserver* observer);
   void AddInputDeviceEventObserver(InputDeviceEventObserver* observer);
   void RemoveInputDeviceEventObserver(InputDeviceEventObserver* observer);
   void AddDisplayConfigurationObserver(DisplayConfigurationObserver* observer);
   void RemoveDisplayConfigurationObserver(
       DisplayConfigurationObserver* observer);
 
-  virtual const display::ManagedDisplayInfo GetDisplayInfo(
+  virtual const display::ManagedDisplayInfo& GetDisplayInfo(
       int64_t display_id) const = 0;
-  virtual aura::Window* GetContainer(int container_id) = 0;
+  virtual aura::Window* GetContainer(int64_t display_id, int container_id) = 0;

[reveman, 2017/05/25 10:52:55]

I don't think we need this anymore.

[Dominik Laskowski, 2017/05/31 02:06:27]

Still needed to parent the cursor surface to the primary root window.

[reveman, 2017/05/31 03:33:10]

Isn't this always returning the container for the primary root window? You can
rename it to GetPrimaryDisplayContainer if you like but let's not make it less
specific unless we have to.

[Dominik Laskowski, 2017/05/31 20:35:54]

Renamed to GetPrimaryDisplayContainer.

   virtual aura::Window* GetActiveWindow() const = 0;
   virtual aura::Window* GetFocusedWindow() const = 0;
   virtual ui::CursorSetType GetCursorSet() const = 0;
   virtual void AddPreTargetHandler(ui::EventHandler* handler) = 0;
   virtual void PrependPreTargetHandler(ui::EventHandler* handler) = 0;
   virtual void RemovePreTargetHandler(ui::EventHandler* handler) = 0;
   virtual void AddPostTargetHandler(ui::EventHandler* handler) = 0;
   virtual void RemovePostTargetHandler(ui::EventHandler* handler) = 0;
   virtual bool IsMaximizeModeWindowManagerEnabled() const = 0;
 
  protected:
   WMHelper();
 
   void NotifyWindowActivated(aura::Window* gained_active,
                              aura::Window* lost_active);
   void NotifyWindowFocused(aura::Window* gained_focus,
                            aura::Window* lost_focus);
   void NotifyCursorVisibilityChanged(bool is_visible);
   void NotifyCursorSetChanged(ui::CursorSetType cursor_set);
+  void NotifyCursorDisplayChanging(const display::Display& display);
   void NotifyMaximizeModeStarted();
   void NotifyMaximizeModeEnding();
   void NotifyMaximizeModeEnded();
   void NotifyKeyboardDeviceConfigurationChanged();
   void NotifyDisplayConfigurationChanged();
 
  private:
   base::ObserverList<ActivationObserver> activation_observers_;
   base::ObserverList<FocusObserver> focus_observers_;
   base::ObserverList<CursorObserver> cursor_observers_;
   base::ObserverList<MaximizeModeObserver> maximize_mode_observers_;
   base::ObserverList<InputDeviceEventObserver> input_device_event_observers_;
   base::ObserverList<DisplayConfigurationObserver> display_config_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WMHelper);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_WM_HELPER_H_