ui: events: Add a class to hold common touch and stylus properties

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"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
@@ skipping 312 matching lines @@
           GetChangedMouseButtonFlagsFromNative(native_event)) {
   if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED)
     SetClickCount(GetRepeatCount(*this));
 }
 
 MouseEvent::MouseEvent(EventType type,
                        const gfx::PointF& location,
                        const gfx::PointF& root_location,
                        base::TimeDelta time_stamp,
                        int flags,
-                       int changed_button_flags)
+                       int changed_button_flags,
+                       const PointerEventDetails& details)
     : LocatedEvent(type, location, root_location, time_stamp, flags),
-      changed_button_flags_(changed_button_flags) {
+      changed_button_flags_(changed_button_flags),
+      pointer_details_(details) {
   if (this->type() == ET_MOUSE_MOVED && IsAnyButton())
     SetType(ET_MOUSE_DRAGGED);
 }
 
 // static
 bool MouseEvent::IsRepeatedClickEvent(
     const MouseEvent& event1,
     const MouseEvent& event2) {
   // These values match the Windows defaults.
   static const int kDoubleClickTimeMS = 500;
@@ skipping 141 matching lines @@
                                  const gfx::PointF& location,
                                  const gfx::PointF& root_location,
                                  base::TimeDelta time_stamp,
                                  int flags,
                                  int changed_button_flags)
     : MouseEvent(ui::ET_MOUSEWHEEL,
                  location,
                  root_location,
                  time_stamp,
                  flags,
-                 changed_button_flags),
-      offset_(offset) {
-}
+                 changed_button_flags,
+                 PointerEventDetails(EventPointerType::POINTER_TYPE_MOUSE)),
+      offset_(offset) {}
 
 #if defined(OS_WIN)
 // This value matches windows WHEEL_DELTA.
 // static
 const int MouseWheelEvent::kWheelDelta = 120;
 #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()),
-      radius_x_(GetTouchRadiusX(native_event)),
-      radius_y_(GetTouchRadiusY(native_event)),
       rotation_angle_(GetTouchAngle(native_event)),
-      force_(GetTouchForce(native_event)),
       may_cause_scrolling_(false),
-      should_remove_native_touch_id_mapping_(false) {
+      should_remove_native_touch_id_mapping_(false),
+      pointer_details_(PointerEventDetails(EventPointerType::POINTER_TYPE_TOUCH,
+                                           GetTouchRadiusX(native_event),
+                                           GetTouchRadiusY(native_event),
+                                           GetTouchForce(native_event),
+                                           /* tilt_x */ 0.0f,
+                                           /* tilt_y */ 0.0f)) {
   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(EventType type,
                        const gfx::PointF& location,
                        int touch_id,
                        base::TimeDelta time_stamp)
     : LocatedEvent(type, location, location, time_stamp, 0),
       touch_id_(touch_id),
       unique_event_id_(ui::GetNextTouchEventId()),
-      radius_x_(0.0f),
-      radius_y_(0.0f),
       rotation_angle_(0.0f),
-      force_(0.0f),
       may_cause_scrolling_(false),
-      should_remove_native_touch_id_mapping_(false) {
+      should_remove_native_touch_id_mapping_(false),
+      pointer_details_(
+          PointerEventDetails(EventPointerType::POINTER_TYPE_TOUCH)) {
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
 }
 
 TouchEvent::TouchEvent(EventType type,
                        const gfx::PointF& location,
                        int flags,
                        int touch_id,
                        base::TimeDelta time_stamp,
-                       float radius_x,
-                       float radius_y,
                        float angle,
-                       float force)
+                       const PointerEventDetails& details)
     : LocatedEvent(type, location, location, time_stamp, flags),
       touch_id_(touch_id),
       unique_event_id_(ui::GetNextTouchEventId()),
-      radius_x_(radius_x),
-      radius_y_(radius_y),
       rotation_angle_(angle),
-      force_(force),
       may_cause_scrolling_(false),
-      should_remove_native_touch_id_mapping_(false) {
+      should_remove_native_touch_id_mapping_(false),
+      pointer_details_(details) {
   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_),
-      radius_x_(copy.radius_x_),
-      radius_y_(copy.radius_y_),
       rotation_angle_(copy.rotation_angle_),
-      force_(copy.force_),
       may_cause_scrolling_(copy.may_cause_scrolling_),
-      should_remove_native_touch_id_mapping_(false) {
+      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_|.
 }
 
 TouchEvent::~TouchEvent() {
   // In ctor TouchEvent(native_event) we call GetTouchId() which in X11
   // platform setups the tracking_id to slot mapping. So in dtor here,
   // if this touch event is a release event, we clear the mapping accordingly.
   if (should_remove_native_touch_id_mapping_) {
     DCHECK(type() == ET_TOUCH_RELEASED || type() == ET_TOUCH_CANCELLED);
     if (type() == ET_TOUCH_RELEASED || type() == ET_TOUCH_CANCELLED)
       ClearTouchIdIfReleased(native_event());
   }
 }
 
 void TouchEvent::UpdateForRootTransform(
     const gfx::Transform& inverted_root_transform) {
   LocatedEvent::UpdateForRootTransform(inverted_root_transform);
   gfx::DecomposedTransform decomp;
   bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
   DCHECK(success);
   if (decomp.scale[0])
-    radius_x_ *= decomp.scale[0];
+    pointer_details_.radius_x_ *= decomp.scale[0];
   if (decomp.scale[1])
-    radius_y_ *= decomp.scale[1];
+    pointer_details_.radius_y_ *= decomp.scale[1];
 }
 
 void TouchEvent::DisableSynchronousHandling() {
   DispatcherApi dispatcher_api(this);
   dispatcher_api.set_result(
       static_cast<EventResult>(result() | ER_DISABLE_SYNC_HANDLING));
 }
 
 void TouchEvent::FixRotationAngle() {
   while (rotation_angle_ < 0)
@@ skipping 320 matching lines @@
 
 ScrollEvent::ScrollEvent(EventType type,
                          const gfx::PointF& location,
                          base::TimeDelta time_stamp,
                          int flags,
                          float x_offset,
                          float y_offset,
                          float x_offset_ordinal,
                          float y_offset_ordinal,
                          int finger_count)
-    : MouseEvent(type, location, location, time_stamp, flags, 0),
+    : MouseEvent(type,
+                 location,
+                 location,
+                 time_stamp,
+                 flags,
+                 0,
+                 PointerEventDetails(EventPointerType::POINTER_TYPE_MOUSE)),
       x_offset_(x_offset),
       y_offset_(y_offset),
       x_offset_ordinal_(x_offset_ordinal),
       y_offset_ordinal_(y_offset_ordinal),
       finger_count_(finger_count) {
   CHECK(IsScrollEvent());
 }
 
 void ScrollEvent::Scale(const float factor) {
   x_offset_ *= factor;
@@ skipping 15 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui