Keep root_location to be in pixels and display coordinates in WS.

services/ui/ws/window_manager_state.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 SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_
 #define SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 78 matching lines @@
 
   // TODO(sky): EventDispatcher is really an implementation detail and should
   // not be exposed.
   EventDispatcher* event_dispatcher() { return &event_dispatcher_; }
 
   CursorState& cursor_state() { return cursor_state_; }
 
   // Returns true if this is the WindowManager of the active user.
   bool IsActive() const;
 
-  void Activate(const gfx::Point& mouse_location_on_screen);
+  void Activate(const gfx::Point& mouse_location_on_display,
+                const int64_t display_id);
   void Deactivate();
 
   // Processes an event from PlatformDisplay.
   void ProcessEvent(const Event& event, int64_t display_id);
 
  private:
   class ProcessedEventTarget;
   friend class Display;
   friend class test::WindowManagerStateTestApi;
 
@@ skipping 123 matching lines @@
 
   // Runs the specified debug accelerator.
   void HandleDebugAccelerator(DebugAcceleratorType type);
 
   // Called when waiting for an event or accelerator to be processed by |tree|.
   void ScheduleInputEventTimeout(WindowTree* tree,
                                  ServerWindow* target,
                                  const Event& event,
                                  EventDispatchPhase phase);
 
+  // Helper function to update |point| to be in screen coordinates.
+  bool ConvertPointToScreen(gfx::Point* point, const int64_t display_id);
+
   // EventDispatcherDelegate:
   void OnAccelerator(uint32_t accelerator_id,
                      const Event& event,
                      AcceleratorPhase phase) override;
   void SetFocusedWindowFromEventDispatcher(ServerWindow* window) override;
   ServerWindow* GetFocusedWindowForEventDispatcher() override;
   void SetNativeCapture(ServerWindow* window) override;
   void ReleaseNativeCapture() override;
   void UpdateNativeCursorFromDispatcher() override;
   void OnCaptureChanged(ServerWindow* new_capture,
                         ServerWindow* old_capture) override;
-  void OnMouseCursorLocationChanged(const gfx::Point& point) override;
+  void OnMouseCursorLocationChanged(const gfx::Point& point,
+                                    const int64_t display_id) override;
   void DispatchInputEventToWindow(ServerWindow* target,
                                   ClientSpecificId client_id,
                                   const Event& event,
                                   Accelerator* accelerator) override;
   ClientSpecificId GetEventTargetClientId(const ServerWindow* window,
                                           bool in_nonclient_area) override;
-  ServerWindow* GetRootWindowContaining(gfx::Point* location) override;
+  ServerWindow* GetRootWindowContaining(gfx::Point* location_in_display,
+                                        int64_t* display_id) override;
   void OnEventTargetNotFound(const Event& event) override;
 
   // ServerWindowObserver:
   void OnWindowEmbeddedAppDisconnected(ServerWindow* window) override;
 
   // The single WindowTree this WindowManagerState is associated with.
   // |window_tree_| owns this.
   WindowTree* window_tree_;
 
   // Set to true the first time SetFrameDecorationValues() is called.
@@ skipping 10 matching lines @@
 
   EventDispatcher event_dispatcher_;
 
   // PlatformDisplay that currently has capture.
   PlatformDisplay* platform_display_with_capture_ = nullptr;
 
   // All the active WindowManagerDisplayRoots.
   WindowManagerDisplayRoots window_manager_display_roots_;
 
   // Id of the display the current event being processed originated from.
   int64_t event_processing_display_id_ = 0;

[sky, 2017/05/17 16:53:42]

I had added this to avoid sending the display_id from EventDispatcher back to
the delegate. Now that EventDispatcher knows the display_id can you remove this?
It may require passing the display_id to the delegate in more cases, but you've
already gone down that path so it should be ok.

[riajiang, 2017/05/19 20:45:05]

Removed event_processing_display_id_ and changed to pass display_id from
EventDispatcher to the delegate.

 
   // Set of WindowManagerDisplayRoots corresponding to Displays that have been
   // destroyed. WindowManagerDisplayRoots are not destroyed immediately when
   // the Display is destroyed to allow the client to destroy the window when it
   // wants to. Once the client destroys the window WindowManagerDisplayRoots is
   // destroyed.
   WindowManagerDisplayRoots orphaned_window_manager_display_roots_;
 
   // All state regarding what the current cursor is.
   CursorState cursor_state_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerState);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_MANAGER_STATE_H_