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 104 matching lines @@
                   int64_t display_id);
 
   // Processes the next valid event in |event_queue_|. If the event has already
   // been processed it is dispatched, otherwise the event is passed to the
   // EventDispatcher for processing.
   void ProcessNextEventFromQueue();
 
   // Dispatches the event to the appropriate client and starts the ack timer.
   void DispatchInputEventToWindowImpl(ServerWindow* target,
                                       ClientSpecificId client_id,
+                                      const int64_t display_id,
                                       const Event& event,
                                       base::WeakPtr<Accelerator> accelerator);
 
   // Registers accelerators used internally for debugging.
   void AddDebugAccelerators();
 
   // Finds the debug accelerator for |event| and if one is found calls
   // HandleDebugAccelerator().
-  void ProcessDebugAccelerator(const Event& event);
+  void ProcessDebugAccelerator(const Event& event, const int64_t display_id);
 
   // Runs the specified debug accelerator.
-  void HandleDebugAccelerator(DebugAcceleratorType type);
+  void HandleDebugAccelerator(DebugAcceleratorType type,
+                              const int64_t display_id);
 
   // Called when waiting for an event or accelerator to be processed by |tree|.
   void ScheduleInputEventTimeout(WindowTree* tree,
                                  ServerWindow* target,
+                                 const int64_t display_id,
                                  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);

[sky, 2017/05/25 22:10:19]

Style guide says out params should be last. Also, document return value.

[riajiang, 2017/05/25 22:59:23]

Done.

+
   // EventDispatcherDelegate:
   void OnAccelerator(uint32_t accelerator_id,
+                     const int64_t display_id,
                      const Event& event,
                      AcceleratorPhase phase) override;
   void SetFocusedWindowFromEventDispatcher(ServerWindow* window) override;
-  ServerWindow* GetFocusedWindowForEventDispatcher() override;
+  ServerWindow* GetFocusedWindowForEventDispatcher(int64_t display_id) 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 int64_t display_id,
                                   const Event& event,
                                   Accelerator* accelerator) override;
   ClientSpecificId GetEventTargetClientId(const ServerWindow* window,
                                           bool in_nonclient_area) override;
-  ServerWindow* GetRootWindowContaining(gfx::Point* location) override;
-  void OnEventTargetNotFound(const Event& event) override;
+  ServerWindow* GetRootWindowContaining(gfx::Point* location_in_display,
+                                        int64_t* display_id) override;
+  void OnEventTargetNotFound(const Event& event,
+                             const int64_t display_id) 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.
   bool got_frame_decoration_values_ = false;
   mojom::FrameDecorationValuesPtr frame_decoration_values_;
 
   std::queue<std::unique_ptr<QueuedEvent>> event_queue_;
 
   std::vector<DebugAccelerator> debug_accelerators_;
 
   // If non-null we're actively waiting for a response from a client for an
   // event.
   std::unique_ptr<InFlightEventDetails> in_flight_event_details_;
 
   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;
-
   // 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_