mash: make Env::last_mouse_location() accurate for Mus

ui/aura/env.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 UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 namespace client {
 class FocusClient;
 }
 
 namespace test {
 class EnvTestHelper;
 }
 
 class EnvObserver;
 class InputStateLookup;
+class MusMouseLocationUpdater;
 class Window;
 class WindowPort;
 class WindowTreeClient;
 class WindowTreeHost;
 
 // A singleton object that tracks general state within Aura.
 class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
  public:
   enum class Mode {
     // Classic aura.
@@ skipping 22 matching lines @@
   int mouse_button_flags() const { return mouse_button_flags_; }
   void set_mouse_button_flags(int mouse_button_flags) {
     mouse_button_flags_ = mouse_button_flags;
   }
   // Returns true if a mouse button is down. This may query the native OS,
   // otherwise it uses |mouse_button_flags_|.
   bool IsMouseButtonDown() const;
 
   // Gets/sets the last mouse location seen in a mouse event in the screen
   // coordinates.
-  const gfx::Point& last_mouse_location() const { return last_mouse_location_; }
+  const gfx::Point& last_mouse_location();

[sadrul, 2017/02/01 17:30:14]

Alternatively, maybe we could keep this const, and make |last_mouse_location_|
mutable?

[sky, 2017/02/01 17:58:09]

Done.

   void set_last_mouse_location(const gfx::Point& last_mouse_location) {
     last_mouse_location_ = last_mouse_location;
   }
 
   // Whether any touch device is currently down.
   bool is_touch_down() const { return is_touch_down_; }
   void set_touch_down(bool value) { is_touch_down_ = value; }
 
   void set_context_factory(ui::ContextFactory* context_factory) {
     context_factory_ = context_factory;
@@ skipping 17 matching lines @@
   // |window| may be null, which indicates all windows share a FocusClient.
   void SetActiveFocusClient(client::FocusClient* focus_client,
                             Window* focus_client_root);
   client::FocusClient* active_focus_client() { return active_focus_client_; }
   Window* active_focus_client_root() { return active_focus_client_root_; }
 
  private:
   class ActiveFocusClientWindowObserver;
 
   friend class test::EnvTestHelper;
+  friend class MusMouseLocationUpdater;
   friend class Window;
   friend class WindowTreeHost;
 
   explicit Env(Mode mode);
 
   void Init();
 
   // Called by the Window when it is initialized. Notifies observers.
   void NotifyWindowInitialized(Window* window);
 
@@ skipping 15 matching lines @@
   // to reset the value.
   Mode mode_;
   WindowTreeClient* window_tree_client_ = nullptr;
 
   base::ObserverList<EnvObserver> observers_;
 
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
   gfx::Point last_mouse_location_;
   bool is_touch_down_;
+  bool get_last_mouse_location_from_mus_;
+  // This may be set to true in tests to force using |last_mouse_location_|
+  // rather than querying WindowTreeClient.
+  bool always_use_last_mouse_location_ = false;
 
   std::unique_ptr<InputStateLookup> input_state_lookup_;
   std::unique_ptr<ui::PlatformEventSource> event_source_;
 
   ui::ContextFactory* context_factory_;
   ui::ContextFactoryPrivate* context_factory_private_;
 
   Window* active_focus_client_root_ = nullptr;
   client::FocusClient* active_focus_client_ = nullptr;
   std::unique_ptr<ActiveFocusClientWindowObserver>
       active_focus_client_window_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_