Overhaul Mandoline event transport code

components/view_manager/gesture_manager.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/gesture_manager.h"
 
 #include <algorithm>
 
 #include "components/view_manager/gesture_manager_delegate.h"
 #include "components/view_manager/public/cpp/keys.h"
@@ skipping 37 matching lines @@
   // TODO(sky): I'm doing this until things are converted. Seems as though we
   // shouldn't do this long term.
   if (result.empty())
     result.push_back(deepest);
   return result;
 }
 
 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->where->x,
+                             event.pointer_data->where->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->where->x = target_location.x();
+  result->pointer_data->where->y = target_location.y();
   return result.Pass();
 }
 
 }  // namespace
 
 // GestureStateChange ----------------------------------------------------------
 
 GestureStateChange::GestureStateChange()
     : chosen_gesture(GestureManager::kInvalidGestureId) {
 }
@@ skipping 464 matching lines @@
   // Explicitly delete the pointers first as this may result in calling back to
   // us to cleanup and delete gestures.
   active_pointers_.clear();
 }
 
 bool GestureManager::ProcessEvent(const mojo::Event& event) {
   if (!event.pointer_data)
     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->where->x),
+                            static_cast<int>(event.pointer_data->where->y));
   switch (event.action) {
     case mojo::EVENT_TYPE_POINTER_DOWN: {
       if (GetPointerById(event.pointer_data->pointer_id)) {
         DVLOG(1) << "received more than one down for a pointer without a "
                  << "corresponding up, id=" << event.pointer_data->pointer_id;
         NOTREACHED();
         return true;
       }
 
       const ServerView* deepest = FindDeepestVisibleView(root_view_, location);
@@ skipping 133 matching lines @@
 void GestureManager::ScheduleDelete(Pointer* pointer) {
   auto iter =
       std::find(active_pointers_.begin(), active_pointers_.end(), pointer);
   if (iter != active_pointers_.end()) {
     active_pointers_.weak_erase(iter);
     pointers_to_delete_.push_back(pointer);
   }
 }
 
 }  // namespace view_manager