Add pointer id to the WebMouseEvent's constructors

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 485 matching lines @@
   reversed_root_transform.TransformPoint(&p);
   location_ = p.AsPointF();
   root_location_ = location_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PointerDetails
 
 PointerDetails::PointerDetails() {}
 
-PointerDetails::PointerDetails(EventPointerType pointer_type, int pointer_id)
+PointerDetails::PointerDetails(EventPointerType pointer_type,
+                               PointerId pointer_id)
     : PointerDetails(pointer_type,
                      pointer_id,
                      /* radius_x */ 0.0f,
                      /* radius_y */ 0.0f,
                      /* force */ std::numeric_limits<float>::quiet_NaN()) {}
 
 PointerDetails::PointerDetails(EventPointerType pointer_type,
-                               int pointer_id,
+                               PointerId pointer_id,
                                float radius_x,
                                float radius_y,
                                float force,
                                float tilt_x,
                                float tilt_y,
                                float tangential_pressure,
                                int twist)
     : 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 == PointerDetails::kUnknownPointerId) {
     id = pointer_type == EventPointerType::POINTER_TYPE_MOUSE
              ? MouseEvent::kMousePointerId
              : 0;
   }
 }
 
 PointerDetails::PointerDetails(EventPointerType pointer_type,
                                const gfx::Vector2d& pointer_offset,
-                               int pointer_id)
+                               PointerId pointer_id)
     : PointerDetails(pointer_type, pointer_id) {
   offset = pointer_offset;
 }
 
 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) {}
 
-const int PointerDetails::kUnknownPointerId = -1;
+const PointerId PointerDetails::kUnknownPointerId = -1;
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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,
@@ skipping 180 matching lines @@
       f &= ~EF_IS_TRIPLE_CLICK;
       break;
     case 3:
       f &= ~EF_IS_DOUBLE_CLICK;
       f |= EF_IS_TRIPLE_CLICK;
       break;
   }
   set_flags(f);
 }
 
-const int MouseEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
+const PointerId MouseEvent::kMousePointerId =
+    std::numeric_limits<PointerId>::max();
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent
 
 MouseWheelEvent::MouseWheelEvent(const base::NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
 }
 
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
@@ skipping 675 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