Avoid two targeting phases in aura client-lib and EventProcessor.

ui/aura/mus/window_tree_client.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 "ui/aura/mus/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 1131 matching lines @@
   // dispatch a window is deleted or moved. In either case we still need to
   // dispatch. Most likely need the display id.
   if (!window || !window->GetWindow()->GetHost()) {
     tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::UNHANDLED);
     return;
   }
 
   WindowTreeHostMus* host = GetWindowTreeHostMus(window);
   DCHECK(host);
 
-  // The location of the event is relative to |window|. As the event is handed
-  // to WindowTreeHost we need it to be relative to WindowTreeHost.
-  if (event->IsLocatedEvent()) {
-    gfx::Point host_location = event->AsLocatedEvent()->location();
-    aura::Window::ConvertPointToTarget(window->GetWindow(), host->window(),
-                                       &host_location);
-    event->AsLocatedEvent()->set_location(host_location);
-  }
-
   EventAckHandler ack_handler(CreateEventResultCallback(event_id));
   // TODO(moshayedi): crbug.com/617222. No need to convert to ui::MouseEvent or
   // ui::TouchEvent once we have proper support for pointer events.
   if (event->IsMousePointerEvent()) {
     if (event->type() == ui::ET_POINTER_WHEEL_CHANGED) {
       ui::MouseWheelEvent mapped_event(*event->AsPointerEvent());
+      // Set the target window of this event to be the window received from mus
+      // window server. EventProcessor will use this target window for event
+      // dispatching instead of trying to find the right target window again.
+      ui::Event::DispatcherApi dispatch_helper(&mapped_event);
+      dispatch_helper.set_target(window->GetWindow());
       host->SendEventToProcessor(&mapped_event);
     } else {
       ui::MouseEvent mapped_event(*event->AsPointerEvent());
+      ui::Event::DispatcherApi dispatch_helper(&mapped_event);
+      dispatch_helper.set_target(window->GetWindow());
       host->SendEventToProcessor(&mapped_event);
     }
   } else if (event->IsTouchPointerEvent()) {
     ui::TouchEvent mapped_event(*event->AsPointerEvent());
+    ui::Event::DispatcherApi dispatch_helper(&mapped_event);
+    dispatch_helper.set_target(window->GetWindow());
     host->SendEventToProcessor(&mapped_event);
   } else {
+    ui::Event::DispatcherApi dispatch_helper(event.get());
+    dispatch_helper.set_target(window->GetWindow());
     host->SendEventToProcessor(event.get());

[sadrul, 2017/02/08 00:24:38]

This should go into some helper function, e.g.
WindowTreeClient::DispatchEventToTarget(ui::Event* event, Window* target);

[riajiang, 2017/02/11 00:43:39]

Done.

   }
   ack_handler.set_handled(event->handled());
 }
 
 void WindowTreeClient::OnPointerEventObserved(std::unique_ptr<ui::Event> event,
                                               uint32_t window_id) {
   DCHECK(event);
   DCHECK(event->IsPointerEvent());
   if (!has_pointer_watcher_)
     return;
@@ skipping 631 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura