Add id properties to PointerEvent

ui/events/gestures/motion_event_aura.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/events/gestures/motion_event_aura.h"
 
 #include "base/logging.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace ui {
@@ skipping 16 matching lines @@
 
   return MotionEvent::TOOL_TYPE_UNKNOWN;
 }
 
 PointerProperties GetPointerPropertiesFromTouchEvent(const TouchEvent& touch) {
   PointerProperties pointer_properties;
   pointer_properties.x = touch.x();
   pointer_properties.y = touch.y();
   pointer_properties.raw_x = touch.root_location_f().x();
   pointer_properties.raw_y = touch.root_location_f().y();
-  pointer_properties.id = touch.touch_id();
+  pointer_properties.id = touch.pointer_details().id;
   pointer_properties.pressure = touch.pointer_details().force;
   pointer_properties.source_device_id = touch.source_device_id();
 
   pointer_properties.SetAxesAndOrientation(touch.pointer_details().radius_x,
                                            touch.pointer_details().radius_y,
                                            touch.rotation_angle());
   if (!pointer_properties.touch_major) {
     pointer_properties.touch_major =
         2.f * GestureConfiguration::GetInstance()->default_radius();
     pointer_properties.touch_minor =
         2.f * GestureConfiguration::GetInstance()->default_radius();
     pointer_properties.orientation = 0;
   }
 
   pointer_properties.tool_type = EventPointerTypeToMotionEventToolType(
       touch.pointer_details().pointer_type);
 
   return pointer_properties;
 }
 
 }  // namespace
 
 MotionEventAura::MotionEventAura() {}
 
 MotionEventAura::~MotionEventAura() {}
 
 bool MotionEventAura::OnTouch(const TouchEvent& touch) {
-  int index = FindPointerIndexOfId(touch.touch_id());
+  int index = FindPointerIndexOfId(touch.pointer_details().id);
   bool pointer_id_is_active = index != -1;
 
   if (touch.type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
     // TODO(tdresser): This should be NOTREACHED() - crbug.com/610423.
     return false;
   } else if (touch.type() != ET_TOUCH_PRESSED && !pointer_id_is_active) {
     // When a window begins capturing touch events, we could have an active
     // touch stream transfered to us, resulting in touch move or touch up events
     // without associated touch down events. Ignore them.
     return false;
@@ skipping 30 matching lines @@
   return true;
 }
 
 void MotionEventAura::CleanupRemovedTouchPoints(const TouchEvent& event) {
   if (event.type() != ET_TOUCH_RELEASED &&
       event.type() != ET_TOUCH_CANCELLED) {
     return;
   }
 
   DCHECK(GetPointerCount());
-  int index_to_delete = GetIndexFromId(event.touch_id());
+  int index_to_delete = GetIndexFromId(event.pointer_details().id);
   set_action_index(-1);
   set_action(MotionEvent::ACTION_NONE);
   pointer(index_to_delete) = pointer(GetPointerCount() - 1);
   PopPointer();
 }
 
 int MotionEventAura::GetSourceDeviceId(size_t pointer_index) const {
   DCHECK_LT(pointer_index, GetPointerCount());
   return pointer(pointer_index).source_device_id;
 }
 
 bool MotionEventAura::AddTouch(const TouchEvent& touch) {
   if (GetPointerCount() == MotionEvent::MAX_TOUCH_POINT_COUNT)
     return false;
 
   PushPointer(GetPointerPropertiesFromTouchEvent(touch));
   return true;
 }
 
 void MotionEventAura::UpdateTouch(const TouchEvent& touch) {
-  pointer(GetIndexFromId(touch.touch_id())) =
+  pointer(GetIndexFromId(touch.pointer_details().id)) =
       GetPointerPropertiesFromTouchEvent(touch);
 }
 
 void MotionEventAura::UpdateCachedAction(const TouchEvent& touch) {
   DCHECK(GetPointerCount());
   switch (touch.type()) {
     case ET_TOUCH_PRESSED:
       if (GetPointerCount() == 1) {
         set_action(ACTION_DOWN);
       } else {
         set_action(ACTION_POINTER_DOWN);
-        set_action_index(GetIndexFromId(touch.touch_id()));
+        set_action_index(GetIndexFromId(touch.pointer_details().id));
       }
       break;
     case ET_TOUCH_RELEASED:
       if (GetPointerCount() == 1) {
         set_action(ACTION_UP);
       } else {
         set_action(ACTION_POINTER_UP);
-        set_action_index(GetIndexFromId(touch.touch_id()));
+        set_action_index(GetIndexFromId(touch.pointer_details().id));
       }
       break;
     case ET_TOUCH_CANCELLED:
       set_action(ACTION_CANCEL);
       break;
     case ET_TOUCH_MOVED:
       set_action(ACTION_MOVE);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 int MotionEventAura::GetIndexFromId(int id) const {
   int index = FindPointerIndexOfId(id);
   // TODO(tdresser): remove these checks once crbug.com/525189 is fixed.
   CHECK_GE(index, 0);
   CHECK_LT(index, static_cast<int>(GetPointerCount()));
   return index;
 }
 
 }  // namespace ui