SourceEventType added to LatencyInfo

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 439 matching lines @@
   root_location_ = location_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseEvent
 
 MouseEvent::MouseEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)),
       pointer_details_(GetMousePointerDetailsFromNative(native_event)) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
   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);
   if (type() == ET_MOUSE_PRESSED || type() == ET_MOUSE_RELEASED)
     SetClickCount(GetRepeatCount(*this));
 }
 
 MouseEvent::MouseEvent(const PointerEvent& pointer_event)
     : LocatedEvent(pointer_event),
       changed_button_flags_(pointer_event.changed_button_flags()),
       pointer_details_(pointer_event.pointer_details()) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
   DCHECK(pointer_event.IsMousePointerEvent());
   switch (pointer_event.type()) {
     case ET_POINTER_DOWN:
       SetType(ET_MOUSE_PRESSED);
       break;
 
     case ET_POINTER_MOVED:
       if (pointer_event.flags() &
           (EF_LEFT_MOUSE_BUTTON | EF_MIDDLE_MOUSE_BUTTON |
            EF_RIGHT_MOUSE_BUTTON)) {
@@ skipping 36 matching lines @@
                        int flags,
                        int changed_button_flags)
     : LocatedEvent(type,
                    gfx::PointF(location),
                    gfx::PointF(root_location),
                    time_stamp,
                    flags),
       changed_button_flags_(changed_button_flags),
       pointer_details_(PointerDetails(EventPointerType::POINTER_TYPE_MOUSE)) {
   DCHECK_NE(ET_MOUSEWHEEL, type);
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
   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.
@@ skipping 109 matching lines @@
   }
   set_flags(f);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent
 
 MouseWheelEvent::MouseWheelEvent(const base::NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
 }
 
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
     : MouseEvent(scroll_event),
       offset_(gfx::ToRoundedInt(scroll_event.x_offset()),
               gfx::ToRoundedInt(scroll_event.y_offset())) {
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
   SetType(ET_MOUSEWHEEL);
 }
 
 MouseWheelEvent::MouseWheelEvent(const PointerEvent& pointer_event)
     : MouseEvent(pointer_event),
       offset_(pointer_event.pointer_details().offset.x(),
               pointer_event.pointer_details().offset.y()) {
   SetType(ET_MOUSEWHEEL);
 }
 
 MouseWheelEvent::MouseWheelEvent(const MouseEvent& mouse_event,
                                  int x_offset,
                                  int y_offset)
     : MouseEvent(mouse_event), offset_(x_offset, y_offset) {
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
   SetType(ET_MOUSEWHEEL);
 }
 
 MouseWheelEvent::MouseWheelEvent(const MouseWheelEvent& mouse_wheel_event)
     : MouseEvent(mouse_wheel_event),
       offset_(mouse_wheel_event.offset()) {
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
   DCHECK_EQ(ET_MOUSEWHEEL, type());
 }
 
 MouseWheelEvent::MouseWheelEvent(const gfx::Vector2d& offset,
                                  const gfx::Point& location,
                                  const gfx::Point& root_location,
                                  base::TimeTicks time_stamp,
                                  int flags,
                                  int changed_button_flags)
     : MouseEvent(ui::ET_UNKNOWN,
                  location,
                  root_location,
                  time_stamp,
                  flags,
                  changed_button_flags),
       offset_(offset) {
   // Set event type to ET_UNKNOWN initially in MouseEvent() to pass the
   // DCHECK for type to enforce that we use MouseWheelEvent() to create
   // a MouseWheelEvent.
   SetType(ui::ET_MOUSEWHEEL);
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
 }
 
 #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()),
       rotation_angle_(GetTouchAngle(native_event)),
       may_cause_scrolling_(false),
       should_remove_native_touch_id_mapping_(false),
       pointer_details_(GetTouchPointerDetailsFromNative(native_event)) {
+  latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   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()) {
+  latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   DCHECK(pointer_event.IsTouchPointerEvent());
   switch (pointer_event.type()) {
     case ET_POINTER_DOWN:
       SetType(ET_TOUCH_PRESSED);
       break;
 
     case ET_POINTER_MOVED:
       SetType(ET_TOUCH_MOVED);
       break;
 
@@ skipping 18 matching lines @@
                    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)) {
+  latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   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)) {
+  latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   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_),
@@ skipping 60 matching lines @@
       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()) {}
+      details_(pointer_event.pointer_details()) {
+  if (IsTouchPointerEvent())
+    latency()->set_source_event_type(ui::SourceEventType::TOUCH);

[tdresser, 2016/09/12 14:23:08]

Should it be set to "OTHER" if it isn't touch?

[sahel, 2016/09/12 17:02:26]

We decided to check the source and set it only in the case of touch. If I set it
to OTHER, it means it's neither TOUCH nor WHEEL, which is not true in all cases.

[tdresser, 2016/09/12 18:03:44]

Don't we only make pointer events for mouse and touch? This will never be wheel,
will it?

+}
 
 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);
@@ skipping 50 matching lines @@
       SetType(ET_POINTER_UP);
       break;
 
     case ET_TOUCH_CANCELLED:
       SetType(ET_POINTER_CANCELLED);
       break;
 
     default:
       NOTREACHED();
   }
+  latency()->set_source_event_type(ui::SourceEventType::TOUCH);
 }
 
 PointerEvent::PointerEvent(EventType type,
                            const gfx::Point& location,
                            const gfx::Point& root_location,
                            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_(pointer_details) {
+  if (IsTouchPointerEvent())
+    latency()->set_source_event_type(ui::SourceEventType::TOUCH);
+}
 
 const int PointerEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
 
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent
 
 // static
 KeyEvent* KeyEvent::last_key_event_ = NULL;
 
 // static
@@ skipping 28 matching lines @@
     last_key_event_->set_time_stamp(event.time_stamp());
     last_key_event_->set_flags(last_key_event_->flags() | ui::EF_IS_REPEAT);
     return true;
   }
   delete last_key_event_;
   last_key_event_ = new KeyEvent(event);
   return false;
 }
 
 KeyEvent::KeyEvent(const base::NativeEvent& native_event)
-    : KeyEvent(native_event, EventFlagsFromNative(native_event)) {}
+    : KeyEvent(native_event, EventFlagsFromNative(native_event)) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
+}
 
 KeyEvent::KeyEvent(const base::NativeEvent& native_event, int event_flags)
     : Event(native_event, EventTypeFromNative(native_event), event_flags),
       key_code_(KeyboardCodeFromNative(native_event)),
       code_(CodeFromNative(native_event)),
       is_char_(IsCharFromNative(native_event)) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
   if (IsRepeated(*this))
     set_flags(flags() | ui::EF_IS_REPEAT);
 
 #if defined(USE_X11)
   NormalizeFlags();
 #endif
 #if defined(OS_WIN)
   // Only Windows has native character events.
   if (is_char_)
     key_ = DomKey::FromCharacter(native_event.wParam);
   else
     key_ = PlatformKeyMap::DomKeyFromKeyboardCode(key_code(), flags());
 #endif
 }
 
 KeyEvent::KeyEvent(EventType type,
                    KeyboardCode key_code,
                    int flags)
     : Event(type, EventTimeForNow(), flags),
       key_code_(key_code),
       code_(UsLayoutKeyboardCodeToDomCode(key_code)) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
 KeyEvent::KeyEvent(EventType type,
                    KeyboardCode key_code,
                    DomCode code,
                    int flags)
     : Event(type, EventTimeForNow(), flags),
       key_code_(key_code),
       code_(code) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
 KeyEvent::KeyEvent(EventType type,
                    KeyboardCode key_code,
                    DomCode code,
                    int flags,
                    DomKey key,
                    base::TimeTicks time_stamp)
     : Event(type, time_stamp, flags),
       key_code_(key_code),
       code_(code),
-      key_(key) {}
+      key_(key) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
+}
 
 KeyEvent::KeyEvent(base::char16 character, KeyboardCode key_code, int flags)
     : Event(ET_KEY_PRESSED, EventTimeForNow(), flags),
       key_code_(key_code),
       code_(DomCode::NONE),
       is_char_(true),
       key_(DomKey::FromCharacter(character)) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
 KeyEvent::KeyEvent(const KeyEvent& rhs)
     : Event(rhs),
       key_code_(rhs.key_code_),
       code_(rhs.code_),
       is_char_(rhs.is_char_),
       key_(rhs.key_) {
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
 KeyEvent& KeyEvent::operator=(const KeyEvent& rhs) {
   if (this != &rhs) {
     Event::operator=(rhs);
     key_code_ = rhs.key_code_;
     code_ = rhs.code_;
     key_ = rhs.key_;
     is_char_ = rhs.is_char_;
   }
+  latency()->set_source_event_type(ui::SourceEventType::OTHER);
   return *this;
 }
 
 KeyEvent::~KeyEvent() {}
 
 void KeyEvent::ApplyLayout() const {
   ui::DomCode code = code_;
   if (code == DomCode::NONE) {
     // Catch old code that tries to do layout without a physical key, and try
     // to recover using the KeyboardCode. Once key events are fully defined
@@ skipping 156 matching lines @@
   } else if (type() == ET_SCROLL_FLING_START ||
              type() == ET_SCROLL_FLING_CANCEL) {
     GetFlingData(native_event,
                  &x_offset_, &y_offset_,
                  &x_offset_ordinal_, &y_offset_ordinal_,
                  NULL);
   } else {
     NOTREACHED() << "Unexpected event type " << type()
         << " when constructing a ScrollEvent.";
   }
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
 }
 
 ScrollEvent::ScrollEvent(EventType type,
                          const gfx::Point& location,
                          base::TimeTicks 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),
       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());
+  latency()->set_source_event_type(ui::SourceEventType::WHEEL);
 }
 
 void ScrollEvent::Scale(const float factor) {
   x_offset_ *= factor;
   y_offset_ *= factor;
   x_offset_ordinal_ *= factor;
   y_offset_ordinal_ *= factor;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureEvent
 
 GestureEvent::GestureEvent(float x,
                            float y,
                            int flags,
                            base::TimeTicks time_stamp,
                            const GestureEventDetails& details,
                            uint32_t unique_touch_event_id)
     : LocatedEvent(details.type(),
                    gfx::PointF(x, y),
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details),
-      unique_touch_event_id_(unique_touch_event_id) {}
+      unique_touch_event_id_(unique_touch_event_id) {
+  latency()->set_source_event_type(ui::SourceEventType::TOUCH);
+}
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui