Add id properties to PointerEvent

ui/events/x/events_x.cc

 // Copyright (c) 2012 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/event_utils.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 104 matching lines @@
   return false;
 }
 
 int GetChangedMouseButtonFlagsFromNative(
     const base::NativeEvent& native_event) {
   return GetChangedMouseButtonFlagsFromXEvent(*native_event);
 }
 
 PointerDetails GetMousePointerDetailsFromNative(
     const base::NativeEvent& native_event) {
-  return PointerDetails(EventPointerType::POINTER_TYPE_MOUSE);
+  return PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
+                        PointerEvent::kMousePointerId);
 }
 
 gfx::Vector2d GetMouseWheelOffset(const base::NativeEvent& native_event) {
   return GetMouseWheelOffsetFromXEvent(*native_event);
 }
 
 base::NativeEvent CopyNativeEvent(const base::NativeEvent& native_event) {
   if (!native_event || native_event->type == GenericEvent)
     return NULL;
   XEvent* copy = new XEvent;
@@ skipping 17 matching lines @@
   return GetTouchAngleFromXEvent(*native_event);
 }
 
 PointerDetails GetTouchPointerDetailsFromNative(
     const base::NativeEvent& native_event) {
   return PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
                         GetTouchRadiusXFromXEvent(*native_event),
                         GetTouchRadiusYFromXEvent(*native_event),
                         GetTouchForceFromXEvent(*native_event),
                         /* tilt_x */ 0.f,
-                        /* tilt_y */ 0.f);
+                        /* tilt_y */ 0.f,
+                        /* tangential_pressure */ 0.0f,
+                        /* twist */ 0, GetTouchIdFromXEvent(*native_event));
 }
 
 bool GetScrollOffsets(const base::NativeEvent& native_event,
                       float* x_offset,
                       float* y_offset,
                       float* x_offset_ordinal,
                       float* y_offset_ordinal,
                       int* finger_count,
                       EventMomentumPhase* momentum_phase) {
   return GetScrollOffsetsFromXEvent(*native_event, x_offset, y_offset,
@@ skipping 54 matching lines @@
       xievent->detail =
           UpdateX11EventButton(event->changed_button_flags(), xievent->detail);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace ui