exo: Fix cursor scale when crossing displays

components/exo/pointer.h

 // Copyright 2015 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_POINTER_H_
 #define COMPONENTS_EXO_POINTER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 55 matching lines @@
   bool IsSurfaceSynchronized() const override;
 
   // Overridden from SurfaceObserver:
   void OnSurfaceDestroying(Surface* surface) override;
 
  private:
   // Returns the effective target for |event|.
   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_;
 
   // The current pointer surface.
   Surface* surface_ = nullptr;
 
   // The current focus surface for the pointer.
   Surface* focus_ = nullptr;
 
   // The location of the pointer in the current focus surface.
   gfx::PointF location_;
 
   // The display-dependent scale applied to the cursor.
   float display_scale_ = 1.0f;
 
   // The display-independent scale applied to the cursor.
   float cursor_scale_ = 1.0f;
 
   // Device scale factor of the display where the mouse is located.
   float device_scale_factor_ = 1.0f;
 
   // The position of the pointer surface relative to the pointer location.
   gfx::Point hotspot_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(Pointer);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_POINTER_H_