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

services/ui/ws/window_tree.cc

 // Copyright 2014 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_tree.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 139 matching lines @@
     return false;
   if (id)
     *id = iter->second;
   return true;
 }
 
 bool WindowTree::HasRoot(const ServerWindow* window) const {
   return roots_.count(window) > 0;
 }
 
+const ServerWindow* WindowTree::FindRootFor(const ServerWindow* window) const {
+  for (const ServerWindow* parent = window; parent; parent = parent->parent()) {
+    if (roots_.count(parent))
+      return parent;
+  }
+  return nullptr;
+}
+
 const ServerWindow* WindowTree::GetWindowByClientId(
     const ClientWindowId& id) const {
   auto iter = client_id_to_window_id_map_.find(id);
   return iter == client_id_to_window_id_map_.end() ? nullptr
                                                    : GetWindow(iter->second);
 }
 
 const Display* WindowTree::GetDisplay(const ServerWindow* window) const {
   return window ? display_manager()->GetDisplayContaining(window) : nullptr;
 }
@@ skipping 987 matching lines @@
                                         const ui::Event& event) {
   GenerateEventAckId();
   WindowManagerDisplayRoot* display_root = GetWindowManagerDisplayRoot(target);
   DCHECK(display_root);
   event_source_wms_ = display_root->window_manager_state();
   // Should only get events from windows attached to a host.
   DCHECK(event_source_wms_);
   bool matched_pointer_watcher = EventMatchesPointerWatcher(event);
   Display* display = GetDisplay(target);
   DCHECK(display);
   client()->OnWindowInputEvent(

[sadrul, 2017/03/16 01:35:16]

This is where the conversion should happen.

       event_ack_id_, ClientWindowIdForWindow(target).id, display->GetId(),
       ui::Event::Clone(event), matched_pointer_watcher);
 }
 
 bool WindowTree::EventMatchesPointerWatcher(const ui::Event& event) const {
   if (!has_pointer_watcher_)
     return false;
   if (!event.IsPointerEvent())
     return false;
   if (pointer_watcher_want_moves_ && event.type() == ui::ET_POINTER_MOVED)
@@ skipping 1001 matching lines @@
   client()->OnCompleteDrop(client_window_id.id, event_flags, cursor_offset,
                            effect_bitmask, callback);
 }
 
 void WindowTree::PerformOnDragDropDone() {
   client()->OnDragDropDone();
 }
 
 }  // namespace ws
 }  // namespace ui