diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc | |
parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc')
-rw-r--r-- | chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc b/chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc index 33429778f0f..48b6e1e8d3f 100644 --- a/chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc +++ b/chromium/content/browser/renderer_host/input/web_input_event_util_unittest.cc @@ -46,7 +46,7 @@ TEST(WebInputEventUtilTest, MotionEventConversion) { WebTouchEvent expected_event( WebInputEvent::kTouchStart, WebInputEvent::kShiftKey | WebInputEvent::kAltKey, - (event.GetEventTime() - base::TimeTicks()).InSecondsF()); + event.GetEventTime()); expected_event.touches_length = 1; WebTouchPoint expected_pointer; expected_pointer.id = pointer.id; @@ -107,8 +107,7 @@ TEST(WebInputEventUtilTest, ScrollUpdateConversion) { ui::CreateWebGestureEventFromGestureEventData(event); EXPECT_EQ(WebInputEvent::kGestureScrollUpdate, web_event.GetType()); EXPECT_EQ(0, web_event.GetModifiers()); - EXPECT_EQ((timestamp - base::TimeTicks()).InSecondsF(), - web_event.TimeStampSeconds()); + EXPECT_EQ(timestamp, web_event.TimeStamp()); EXPECT_EQ(pos.x(), web_event.PositionInWidget().x); EXPECT_EQ(pos.y(), web_event.PositionInWidget().y); EXPECT_EQ(raw_pos.x(), web_event.PositionInScreen().x); |