exo: Fix cursor scale when crossing displays

components/exo/pointer.h

Index: components/exo/pointer.h
diff --git a/components/exo/pointer.h b/components/exo/pointer.h
index 0757188311a94662ae9e53befd9c899e9e5e8547..318c466e6a29d4091a40ab8db1e1cbda4d7775b4 100644
--- a/components/exo/pointer.h
+++ b/components/exo/pointer.h
@@ -73,13 +73,15 @@ class Pointer : public ui::EventHandler,
   Surface* GetEffectiveTargetForEvent(ui::Event* event) const;
 
   // Asynchronously update the cursor by capturing a snapshot of |surface_|.
-  void CaptureCursor();
+  void CaptureCursor(bool force);
 
   // Called when cursor snapshot has been captured.
   void OnCursorCaptured(const gfx::Point& hotspot,
+                        bool force,
                         std::unique_ptr<cc::CopyOutputResult> result);
 
-  void UpdateCursor(gfx::NativeCursor cursor);
+  // If |force| is true, the cursor is updated even if locked.
+  void UpdateCursor(gfx::NativeCursor cursor, bool force);
 
   // The delegate instance that all events are dispatched to.
   PointerDelegate* const delegate_;
@@ -108,7 +110,7 @@ class Pointer : public ui::EventHandler,
   const std::unique_ptr<aura::Window> cursor_;
 
   // Source used for cursor capture copy output requests.
-  const base::UnguessableToken cursor_capture_source_id_;
+  base::UnguessableToken cursor_capture_source_id_;
 
   // Weak pointer factory used for cursor capture callbacks.
   base::WeakPtrFactory<Pointer> cursor_capture_weak_ptr_factory_;