Add id properties to PointerEvent

ui/events/event_unittest.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.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 668 matching lines @@
 TEST(EventTest, PointerDetailsStylus) {
   ui::MouseEvent stylus_event(ET_MOUSE_PRESSED, gfx::Point(0, 0),
                               gfx::Point(0, 0), ui::EventTimeForNow(), 0, 0);
   ui::PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
                                      /* radius_x */ 0.0f,
                                      /* radius_y */ 0.0f,
                                      /* force */ 21.0f,
                                      /* tilt_x */ 45.0f,
                                      /* tilt_y */ -45.0f,
                                      /* tangential_pressure */ 0.7f,
-                                     /* twist */ 196);
+                                     /* twist */ 196,
+                                     /* id */ 3);
 
   stylus_event.set_pointer_details(pointer_details);
   EXPECT_EQ(EventPointerType::POINTER_TYPE_PEN,
             stylus_event.pointer_details().pointer_type);
   EXPECT_EQ(21.0f, stylus_event.pointer_details().force);
   EXPECT_EQ(45.0f, stylus_event.pointer_details().tilt_x);
   EXPECT_EQ(-45.0f, stylus_event.pointer_details().tilt_y);
   EXPECT_EQ(0.0f, stylus_event.pointer_details().radius_x);
   EXPECT_EQ(0.0f, stylus_event.pointer_details().radius_y);
   EXPECT_EQ(0.7f, stylus_event.pointer_details().tangential_pressure);
   EXPECT_EQ(196, stylus_event.pointer_details().twist);
+  EXPECT_EQ(3U, stylus_event.pointer_details().id);
 
   ui::MouseEvent stylus_event_copy(stylus_event);
   EXPECT_EQ(stylus_event.pointer_details(),
             stylus_event_copy.pointer_details());
 }
 
 TEST(EventTest, PointerDetailsCustomTouch) {
   ui::TouchEvent touch_event(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0,
                              ui::EventTimeForNow());
 
   EXPECT_EQ(EventPointerType::POINTER_TYPE_TOUCH,
             touch_event.pointer_details().pointer_type);
   EXPECT_EQ(0.0f, touch_event.pointer_details().radius_x);
   EXPECT_EQ(0.0f, touch_event.pointer_details().radius_y);
   EXPECT_TRUE(std::isnan(touch_event.pointer_details().force));
   EXPECT_EQ(0.0f, touch_event.pointer_details().tilt_x);
   EXPECT_EQ(0.0f, touch_event.pointer_details().tilt_y);
 
   ui::PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
                                      /* radius_x */ 5.0f,
                                      /* radius_y */ 6.0f,
                                      /* force */ 21.0f,
                                      /* tilt_x */ 45.0f,
                                      /* tilt_y */ -45.0f,
                                      /* tangential_pressure */ 0.7f,
-                                     /* twist */ 196);
+                                     /* twist */ 196,
+                                     /* id */ 3);
   touch_event.set_pointer_details(pointer_details);
 
   EXPECT_EQ(EventPointerType::POINTER_TYPE_PEN,
             touch_event.pointer_details().pointer_type);
   EXPECT_EQ(21.0f, touch_event.pointer_details().force);
   EXPECT_EQ(45.0f, touch_event.pointer_details().tilt_x);
   EXPECT_EQ(-45.0f, touch_event.pointer_details().tilt_y);
   EXPECT_EQ(5.0f, touch_event.pointer_details().radius_x);
   EXPECT_EQ(6.0f, touch_event.pointer_details().radius_y);
   EXPECT_EQ(0.7f, touch_event.pointer_details().tangential_pressure);
   EXPECT_EQ(196, touch_event.pointer_details().twist);
+  EXPECT_EQ(3U, touch_event.pointer_details().id);
 
   ui::TouchEvent touch_event_copy(touch_event);
   EXPECT_EQ(touch_event.pointer_details(), touch_event_copy.pointer_details());
 }
 
 TEST(EventTest, PointerEventCanConvertFrom) {
   const gfx::Point point;
   const base::TimeTicks time;
 
   // Common mouse events can be converted.
@@ skipping 289 matching lines @@
   XButtonEvent* button_event = &(native_event.xbutton);
   button_event->type = ButtonPress;
   button_event->button = 4; // A valid wheel button number between min and max.
   MouseWheelEvent mouse_ev(&native_event);
 
   histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1);
 #endif
 }
 
 }  // namespace ui