Overhaul Mandoline event transport code

components/view_manager/event_dispatcher.cc

 // Copyright 2015 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 "components/view_manager/event_dispatcher.h"
 
 #include "components/view_manager/server_view.h"
 #include "components/view_manager/view_coordinate_conversions.h"
 #include "components/view_manager/view_locator.h"
 #include "components/view_manager/view_tree_host_impl.h"
@@ skipping 57 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 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)) {
       target = FindDeepestVisibleView(root, root_point);
       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;
   }
 
   return focused_view;
 }
 
 }  // namespace view_manager