Index: ui/events/ozone/evdev/event_converter_evdev.cc |
diff --git a/ui/events/ozone/evdev/event_converter_evdev.cc b/ui/events/ozone/evdev/event_converter_evdev.cc |
index dcb23ca38347c2b23fc118979d35b30d14045b45..ed4aa9b516f5707b82a8ea28c95e41c6257e8a0b 100644 |
--- a/ui/events/ozone/evdev/event_converter_evdev.cc |
+++ b/ui/events/ozone/evdev/event_converter_evdev.cc |
@@ -12,6 +12,7 @@ |
#include "base/logging.h" |
#include "base/message_loop/message_loop.h" |
#include "base/trace_event/trace_event.h" |
+#include "ui/events/base_event_utils.h" |
#include "ui/events/devices/device_util_linux.h" |
#include "ui/events/devices/input_device.h" |
@@ -143,9 +144,9 @@ void EventConverterEvdev::SetCapsLockLed(bool enabled) { |
void EventConverterEvdev::SetTouchEventLoggingEnabled(bool enabled) { |
} |
-base::TimeDelta EventConverterEvdev::TimeDeltaFromInputEvent( |
+base::TimeTicks EventConverterEvdev::TimeTicksFromInputEvent( |
const input_event& event) { |
- return base::TimeDelta::FromMicroseconds( |
- static_cast<int64_t>(event.time.tv_sec) * 1000000L + event.time.tv_usec); |
+ return ui::EventTimeStampFromSeconds(event.time.tv_sec) + |
miu
2016/05/16 20:05:35
Same thing here: How will you ensure this does not
majidvp
2016/05/21 01:38:00
Added a validation check. If we find out that it g
majidvp
2016/05/24 21:01:38
After chatting with sadrul@, I decided to add this
miu
2016/05/25 01:42:31
Acknowledged. Looks good.
|
+ base::TimeDelta::FromMicroseconds(event.time.tv_usec); |
} |
} // namespace ui |