Change OnWindowInputEvent to use display_id to find the host and update event root_location in WS.

services/ui/ws/window_manager_state_unittest.cc

 // 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.
 
 #include "services/ui/ws/window_manager_state.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 367 matching lines @@
 // then try to send any queued events.
 TEST_F(WindowManagerStateTest, DontSendQueuedEventsToADeadTree) {
   ServerWindow* target = window();
   TestChangeTracker* tracker = window_tree_client()->tracker();
 
   ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(5, 5), gfx::Point(5, 5),
                        base::TimeTicks(), EF_LEFT_MOUSE_BUTTON,
                        EF_LEFT_MOUSE_BUTTON);
   DispatchInputEventToWindow(target, press, nullptr);
   ASSERT_EQ(1u, tracker->changes()->size());
-  EXPECT_EQ("InputEvent window=1,1 event_action=1",
+  EXPECT_EQ("InputEvent window=1,1 event_action=1 event_root_location=5,5",
             ChangesToDescription1(*tracker->changes())[0]);
   tracker->changes()->clear();
   // The above is not setting TreeAwaitingInputAck.
 
   // Queue the key release event; it should not be immediately dispatched
   // because there's no ACK for the last one.
   ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(5, 5),
                          gfx::Point(5, 5), base::TimeTicks(),
                          EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON);
   DispatchInputEventToWindow(target, release, nullptr);
@@ skipping 182 matching lines @@
   ui::PointerEvent move(
       ui::ET_POINTER_MOVED, gfx::Point(25, 25), gfx::Point(25, 25), 0, 0, 0,
       ui::PointerDetails(EventPointerType::POINTER_TYPE_MOUSE),
       base::TimeTicks());
   window_manager_state()->ProcessEvent(move, 0);
   // The event isn't over a valid target, which should trigger resetting the
   // cursor to POINTER.
   EXPECT_EQ(ui::mojom::Cursor::POINTER, display_test_api.last_cursor());
 }
 
+TEST_F(WindowManagerStateTest, RootLocationCoordinateConversion) {
+  TestWindowTreeClient* embed_connection = nullptr;
+  WindowTree* target_tree = nullptr;
+  ServerWindow* target = nullptr;
+  window()->SetBounds(gfx::Rect(10, 10, 100, 100));
+  CreateSecondaryTree(&embed_connection, &target_tree, &target);
+  TestWindowManager target_window_manager;
+  WindowTreeTestApi(target_tree)
+      .set_window_manager_internal(&target_window_manager);
+
+  const gfx::Point event_location(40, 50);
+  const gfx::Point event_root_location(30, 40);
+  ui::MouseEvent mouse(ui::ET_MOUSE_MOVED, event_location, event_root_location,
+                       base::TimeTicks(), 0, 0);
+  std::unique_ptr<Accelerator> accelerator = CreateAccelerator();
+  DispatchInputEventToWindow(target, mouse, accelerator.get());
+  TestChangeTracker* tracker = embed_connection->tracker();
+  ASSERT_EQ(1u, tracker->changes()->size());
+  EXPECT_EQ("InputEvent window=2,1 event_action=4 event_root_location=20,30",
+            ChangesToDescription1(*tracker->changes())[0]);
+  EXPECT_TRUE(wm_client()->tracker()->changes()->empty());
+}
+
 }  // namespace test
 }  // namespace ws
 }  // namespace ui