Overhaul Mandoline event transport code

components/view_manager/event_dispatcher.cc

Index: components/view_manager/event_dispatcher.cc
diff --git a/components/view_manager/event_dispatcher.cc b/components/view_manager/event_dispatcher.cc
index 18bac6329b20b1f4296d5a8315105f2048c6f9e7..750a00ab1bb8690dddea349cbb69c01131dfa42e 100644
--- a/components/view_manager/event_dispatcher.cc
+++ b/components/view_manager/event_dispatcher.cc
@@ -75,8 +75,9 @@ ServerView* EventDispatcher::FindEventTarget(mojo::Event* event) {
   ServerView* focused_view = view_tree_host_->GetFocusedView();
   if (event->pointer_data) {
     ServerView* root = view_tree_host_->root_view();
-    const gfx::Point root_point(static_cast<int>(event->pointer_data->x),
-                                static_cast<int>(event->pointer_data->y));
+    const gfx::Point root_point(
+        static_cast<int>(event->pointer_data->where->x),
+        static_cast<int>(event->pointer_data->where->y));
     ServerView* target = focused_view;
     if (event->action == mojo::EVENT_TYPE_POINTER_DOWN || !target ||
         !root->Contains(target)) {
@@ -84,10 +85,10 @@ ServerView* EventDispatcher::FindEventTarget(mojo::Event* event) {
       CHECK(target);
     }
     const gfx::PointF local_point(ConvertPointFBetweenViews(
-        root, target,
-        gfx::PointF(event->pointer_data->x, event->pointer_data->y)));
-    event->pointer_data->x = local_point.x();
-    event->pointer_data->y = local_point.y();
+        root, target, gfx::PointF(event->pointer_data->where->x,
+                                  event->pointer_data->where->y)));
+    event->pointer_data->where->x = local_point.x();
+    event->pointer_data->where->y = local_point.y();
     return target;
   }