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/native_web_keyboard_event_android.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/native_web_keyboard_event_android.cc')
| -rw-r--r-- | chromium/content/browser/renderer_host/native_web_keyboard_event_android.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/chromium/content/browser/renderer_host/native_web_keyboard_event_android.cc b/chromium/content/browser/renderer_host/native_web_keyboard_event_android.cc index 1ebfab212ea..83ffef0cd75 100644 --- a/chromium/content/browser/renderer_host/native_web_keyboard_event_android.cc +++ b/chromium/content/browser/renderer_host/native_web_keyboard_event_android.cc @@ -14,14 +14,7 @@ namespace content { NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type, int modifiers, base::TimeTicks timestamp) - : NativeWebKeyboardEvent(type, - modifiers, - ui::EventTimeStampToSeconds(timestamp)) {} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type, - int modifiers, - double timestampSeconds) - : WebKeyboardEvent(type, modifiers, timestampSeconds), + : WebKeyboardEvent(type, modifiers, timestamp), os_event(nullptr), skip_in_browser(false) {} @@ -35,7 +28,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent( const base::android::JavaRef<jobject>& android_key_event, blink::WebInputEvent::Type type, int modifiers, - double time_secs, + base::TimeTicks timestamp, int keycode, int scancode, int unicode_character, @@ -44,7 +37,7 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent( android_key_event, type, modifiers, - time_secs, + timestamp, keycode, scancode, unicode_character, |