content/browser/renderer_host/ui_events_helper.cc - Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/ui_events_helper.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | content/browser/renderer_host/web_input_event_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/ui_events_helper.cc

diff --git a/content/browser/renderer_host/ui_events_helper.cc b/content/browser/renderer_host/ui_events_helper.cc

index a062303cc07e63ebe066c615d61f5640e46030db..ace5682f73cfa21067a3b98e68df75a1b38c8bb4 100644

--- a/content/browser/renderer_host/ui_events_helper.cc

+++ b/content/browser/renderer_host/ui_events_helper.cc

@@ -9,6 +9,7 @@

#include "content/browser/renderer_host/input/web_input_event_util.h"

#include "content/common/input/web_touch_event_traits.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

+#include "ui/events/base_event_utils.h"

#include "ui/events/blink/blink_event_util.h"

#include "ui/events/event.h"

#include "ui/events/event_constants.h"

@@ -64,8 +65,8 @@ bool MakeUITouchEventsFromWebTouchEvents(

}

int flags = WebEventModifiersToEventFlags(touch.modifiers);

- base::TimeDelta timestamp = base::TimeDelta::FromMicroseconds(

- static_cast<int64_t>(touch.timeStampSeconds * 1000000));

+ base::TimeTicks timestamp =

+ ui::EventTimeStampFromSeconds(touch.timeStampSeconds);

for (unsigned i = 0; i < touch.touchesLength; ++i) {

const blink::WebTouchPoint& point = touch.touches[i];

if (WebTouchPointStateToEventType(point.state) != type)