Add id properties to PointerEvent

ui/events/event.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 <utility>
 
 #include "base/memory/ptr_util.h"
 
@@ skipping 483 matching lines @@
 void LocatedEvent::UpdateForRootTransform(
     const gfx::Transform& reversed_root_transform) {
   // Transform has to be done at root level.
   gfx::Point3F p(location_);
   reversed_root_transform.TransformPoint(&p);
   location_ = p.AsPointF();
   root_location_ = location_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// PointerDetails
+
+PointerDetails::PointerDetails() {}
+
+PointerDetails::PointerDetails(EventPointerType pointer_type, int pointer_id)
+    : pointer_type(pointer_type),
+      force(std::numeric_limits<float>::quiet_NaN()),
+      id(pointer_id) {
+  if (pointer_id == -1) {
+    id = pointer_type == EventPointerType::POINTER_TYPE_TOUCH
+             ? 0
+             : PointerEvent::kMousePointerId;
+  }
+}
+
+PointerDetails::PointerDetails(EventPointerType pointer_type,
+                               float radius_x,
+                               float radius_y,
+                               float force,
+                               float tilt_x,
+                               float tilt_y,
+                               float tangential_pressure,
+                               int twist,
+                               int pointer_id)
+    : pointer_type(pointer_type),
+      // If we aren't provided with a radius on one axis, use the
+      // information from the other axis.
+      radius_x(radius_x > 0 ? radius_x : radius_y),
+      radius_y(radius_y > 0 ? radius_y : radius_x),
+      force(force),
+      tilt_x(tilt_x),
+      tilt_y(tilt_y),
+      tangential_pressure(tangential_pressure),
+      twist(twist),
+      id(pointer_id) {
+  if (pointer_id == -1) {
+    id = pointer_type == EventPointerType::POINTER_TYPE_TOUCH
+             ? 0
+             : PointerEvent::kMousePointerId;
+  }
+}
+
+PointerDetails::PointerDetails(EventPointerType pointer_type,
+                               const gfx::Vector2d& offset,
+                               int pointer_id)
+    : pointer_type(pointer_type),
+      force(std::numeric_limits<float>::quiet_NaN()),
+      id(pointer_id),
+      offset(offset) {
+  if (pointer_id == -1) {

[sadrul, 2017/02/13 16:47:42]

Instead of -1, use some const, e.g. PointerDetails::kUnknownPointerId (or
something like that).

[lanwei, 2017/02/13 21:50:28]

Done.

+    id = pointer_type == EventPointerType::POINTER_TYPE_TOUCH
+             ? 0
+             : PointerEvent::kMousePointerId;
+  }

[sadrul, 2017/02/13 16:47:42]

Use a delegated constructor, instead of repeating this block everywhere.

[lanwei, 2017/02/13 21:50:29]

Done.

+}
+
+PointerDetails::PointerDetails(const PointerDetails& other)
+    : pointer_type(other.pointer_type),
+      radius_x(other.radius_x),
+      radius_y(other.radius_y),
+      force(other.force),
+      tilt_x(other.tilt_x),
+      tilt_y(other.tilt_y),
+      tangential_pressure(other.tangential_pressure),
+      twist(other.twist),
+      id(other.id),
+      offset(other.offset) {}
+
+////////////////////////////////////////////////////////////////////////////////
 // MouseEvent
 
 MouseEvent::MouseEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
       pointer_details_(GetMousePointerDetailsFromNative(native_event)) {
   latency()->AddLatencyNumberWithTimestamp(
       INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0,
       base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()), 1);
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
@@ skipping 245 matching lines @@
 #else
 // This value matches GTK+ wheel scroll amount.
 const int MouseWheelEvent::kWheelDelta = 53;
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent
 
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
-      touch_id_(GetTouchId(native_event)),
       unique_event_id_(ui::GetNextTouchEventId()),
       rotation_angle_(GetTouchAngle(native_event)),
       may_cause_scrolling_(false),
       should_remove_native_touch_id_mapping_(false),
       pointer_details_(GetTouchPointerDetailsFromNative(native_event)) {
   latency()->AddLatencyNumberWithTimestamp(
       INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0,
       base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()), 1);
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 
   FixRotationAngle();
   if (type() == ET_TOUCH_RELEASED || type() == ET_TOUCH_CANCELLED)
     should_remove_native_touch_id_mapping_ = true;
 }
 
 TouchEvent::TouchEvent(const PointerEvent& pointer_event)
     : LocatedEvent(pointer_event),
-      touch_id_(pointer_event.pointer_id()),
       unique_event_id_(ui::GetNextTouchEventId()),
       rotation_angle_(0.0f),
       may_cause_scrolling_(false),
       should_remove_native_touch_id_mapping_(false),
       pointer_details_(pointer_event.pointer_details()) {
   DCHECK(pointer_event.IsTouchPointerEvent());
   switch (pointer_event.type()) {
     case ET_POINTER_DOWN:
       SetType(ET_TOUCH_PRESSED);
       break;
@@ skipping 17 matching lines @@
 
 TouchEvent::TouchEvent(EventType type,
                        const gfx::Point& location,
                        int touch_id,
                        base::TimeTicks time_stamp)
     : LocatedEvent(type,
                    gfx::PointF(location),
                    gfx::PointF(location),
                    time_stamp,
                    0),
-      touch_id_(touch_id),
       unique_event_id_(ui::GetNextTouchEventId()),
       rotation_angle_(0.0f),
       may_cause_scrolling_(false),
       should_remove_native_touch_id_mapping_(false),
-      pointer_details_(PointerDetails(EventPointerType::POINTER_TYPE_TOUCH)) {
+      pointer_details_(
+          PointerDetails(EventPointerType::POINTER_TYPE_TOUCH, touch_id)) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }
 
 TouchEvent::TouchEvent(EventType type,
                        const gfx::Point& location,
                        int flags,
                        int touch_id,
                        base::TimeTicks time_stamp,
                        float radius_x,
                        float radius_y,
                        float angle,
                        float force)
     : LocatedEvent(type,
                    gfx::PointF(location),
                    gfx::PointF(location),
                    time_stamp,
                    flags),
-      touch_id_(touch_id),
       unique_event_id_(ui::GetNextTouchEventId()),
       rotation_angle_(angle),
       may_cause_scrolling_(false),
       should_remove_native_touch_id_mapping_(false),
       pointer_details_(PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
                                       radius_x,
                                       radius_y,
                                       force,
                                       /* tilt_x */ 0.0f,
-                                      /* tilt_y */ 0.0f)) {
+                                      /* tilt_y */ 0.0f,
+                                      /* tangential_pressure */ 0.0f,
+                                      /* twist */ 0,
+                                      touch_id)) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
   FixRotationAngle();
 }
 
 TouchEvent::TouchEvent(const TouchEvent& copy)
     : LocatedEvent(copy),
-      touch_id_(copy.touch_id_),
       unique_event_id_(copy.unique_event_id_),
       rotation_angle_(copy.rotation_angle_),
       may_cause_scrolling_(copy.may_cause_scrolling_),
       should_remove_native_touch_id_mapping_(false),
       pointer_details_(copy.pointer_details_) {
   // Copied events should not remove touch id mapping, as this either causes the
   // mapping to be lost before the initial event has finished dispatching, or
   // the copy to attempt to remove the mapping from a null |native_event_|.
 }
 
@@ skipping 51 matching lines @@
     case ET_TOUCH_RELEASED:
     case ET_TOUCH_CANCELLED:
       return true;
     default:
       return false;
   }
 }
 
 PointerEvent::PointerEvent(const PointerEvent& pointer_event)
     : LocatedEvent(pointer_event),
-      pointer_id_(pointer_event.pointer_id()),
       changed_button_flags_(pointer_event.changed_button_flags()),
       details_(pointer_event.pointer_details()) {
   if (details_.pointer_type == EventPointerType::POINTER_TYPE_TOUCH)
     latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   else if (pointer_event.type() == ET_POINTER_WHEEL_CHANGED)
     latency()->set_source_event_type(ui::SourceEventType::WHEEL);
   else
     latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
 PointerEvent::PointerEvent(const MouseEvent& mouse_event)
     : LocatedEvent(mouse_event),
-      pointer_id_(kMousePointerId),
       changed_button_flags_(mouse_event.changed_button_flags()),
       details_(mouse_event.pointer_details()) {
   DCHECK(CanConvertFrom(mouse_event));
   switch (mouse_event.type()) {
     case ET_MOUSE_PRESSED:
       SetType(ET_POINTER_DOWN);
       latency()->set_source_event_type(ui::SourceEventType::OTHER);
       break;
 
     case ET_MOUSE_DRAGGED:
@@ skipping 13 matching lines @@
       break;
 
     case ET_MOUSE_RELEASED:
       SetType(ET_POINTER_UP);
       latency()->set_source_event_type(ui::SourceEventType::OTHER);
       break;
 
     case ET_MOUSEWHEEL:
       SetType(ET_POINTER_WHEEL_CHANGED);
       details_ = PointerDetails(EventPointerType::POINTER_TYPE_MOUSE,
-                                mouse_event.AsMouseWheelEvent()->offset());
+                                mouse_event.AsMouseWheelEvent()->offset(),
+                                mouse_event.pointer_details().id);
       latency()->set_source_event_type(ui::SourceEventType::WHEEL);
       break;
 
     case ET_MOUSE_CAPTURE_CHANGED:
       SetType(ET_POINTER_CAPTURE_CHANGED);
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 PointerEvent::PointerEvent(const TouchEvent& touch_event)
     : LocatedEvent(touch_event),
-      pointer_id_(touch_event.touch_id()),
       changed_button_flags_(0),
       details_(touch_event.pointer_details()) {
   DCHECK(CanConvertFrom(touch_event));
   switch (touch_event.type()) {
     case ET_TOUCH_PRESSED:
       SetType(ET_POINTER_DOWN);
       break;
 
     case ET_TOUCH_MOVED:
       SetType(ET_POINTER_MOVED);
@@ skipping 19 matching lines @@
                            int flags,
                            int pointer_id,
                            int changed_button_flags,
                            const PointerDetails& pointer_details,
                            base::TimeTicks time_stamp)
     : LocatedEvent(type,
                    gfx::PointF(location),
                    gfx::PointF(root_location),
                    time_stamp,
                    flags),
-      pointer_id_(pointer_id),
       changed_button_flags_(changed_button_flags),
       details_(pointer_details) {
+  details_.id = pointer_id;
   if (details_.pointer_type == EventPointerType::POINTER_TYPE_TOUCH)
     latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   else if (type == ET_POINTER_WHEEL_CHANGED)
     latency()->set_source_event_type(ui::SourceEventType::WHEEL);
   else
     latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
 const int PointerEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
 
@@ skipping 338 matching lines @@
                    flags | EF_FROM_TOUCH),
       details_(details),
       unique_touch_event_id_(unique_touch_event_id) {
   latency()->set_source_event_type(ui::SourceEventType::TOUCH);
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui