Overhaul Mandoline event transport code

components/mus/gesture_manager.cc

Index: components/mus/gesture_manager.cc
diff --git a/components/mus/gesture_manager.cc b/components/mus/gesture_manager.cc
index d1705dbd0fc304e1ae679673a27c8462e20e3fb6..0b35c9a5bdf36e2e6125f50efad3e72c6b4a03da 100644
--- a/components/mus/gesture_manager.cc
+++ b/components/mus/gesture_manager.cc
@@ -55,11 +55,12 @@ Views GetTouchTargets(const ServerView* deepest) {
 mojo::EventPtr CloneEventForView(const mojo::Event& event,
                                  const ServerView* view) {
   mojo::EventPtr result(event.Clone());
-  const gfx::PointF location(event.pointer_data->x, event.pointer_data->y);
+  const gfx::PointF location(event.pointer_data->location->x,
+                             event.pointer_data->location->y);
   const gfx::PointF target_location(
       ConvertPointFBetweenViews(view->GetRoot(), view, location));
-  result->pointer_data->x = target_location.x();
-  result->pointer_data->y = target_location.y();
+  result->pointer_data->location->x = target_location.x();
+  result->pointer_data->location->y = target_location.y();
   return result.Pass();
 }
 
@@ -538,8 +539,8 @@ bool GestureManager::ProcessEvent(const mojo::Event& event) {
     return false;
 
   ScheduledDeleteProcessor delete_processor(this);
-  const gfx::Point location(static_cast<int>(event.pointer_data->x),
-                            static_cast<int>(event.pointer_data->y));
+  const gfx::Point location(static_cast<int>(event.pointer_data->location->x),
+                            static_cast<int>(event.pointer_data->location->y));
   switch (event.action) {
     case mojo::EVENT_TYPE_POINTER_DOWN: {
       if (GetPointerById(event.pointer_data->pointer_id)) {