Index: content/browser/renderer_host/web_input_event_aura.cc |
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/content/browser/renderer_host/web_input_event_aura.cc |
index 2e0c2bbc663ed1b39270c9505827170eb01531ac..64d2188b4c83119921224569ea727c4f9b7d0e36 100644 |
--- a/content/browser/renderer_host/web_input_event_aura.cc |
+++ b/content/browser/renderer_host/web_input_event_aura.cc |
@@ -9,6 +9,7 @@ |
#include "content/browser/renderer_host/ui_events_helper.h" |
#include "ui/aura/client/screen_position_client.h" |
#include "ui/aura/window.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_utils.h" |
@@ -56,23 +57,24 @@ blink::WebPointerProperties::PointerType EventPointerTypeToWebPointerType( |
#if defined(OS_WIN) |
blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent( |
const base::NativeEvent& native_event, |
- const base::TimeDelta& time_stamp); |
+ const base::TimeTicks& time_stamp); |
blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent( |
const base::NativeEvent& native_event, |
- const base::TimeDelta& time_stamp); |
+ const base::TimeTicks& time_stamp); |
blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent( |
const base::NativeEvent& native_event, |
- const base::TimeDelta& time_stamp); |
+ const base::TimeTicks& time_stamp); |
blink::WebGestureEvent MakeWebGestureEventFromNativeEvent( |
const base::NativeEvent& native_event, |
- const base::TimeDelta& time_stamp); |
+ const base::TimeTicks& time_stamp); |
#endif |
blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent( |
const ui::KeyEvent& event) { |
blink::WebKeyboardEvent webkit_event; |
- webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
+ webkit_event.timeStampSeconds = |
+ ui::EventTimeStampToSeconds(event.time_stamp()); |
webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()) | |
DomCodeToWebInputEventModifiers(event.code()); |
@@ -115,7 +117,8 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( |
webkit_event.type = blink::WebInputEvent::MouseWheel; |
webkit_event.button = blink::WebMouseEvent::ButtonNone; |
webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); |
- webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
+ webkit_event.timeStampSeconds = |
+ ui::EventTimeStampToSeconds(event.time_stamp()); |
webkit_event.hasPreciseScrollingDeltas = true; |
float offset_ordinal_x = 0.f; |
@@ -163,7 +166,8 @@ blink::WebGestureEvent MakeWebGestureEventFromAuraEvent( |
webkit_event.sourceDevice = blink::WebGestureDeviceTouchpad; |
webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); |
- webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
+ webkit_event.timeStampSeconds = |
+ ui::EventTimeStampToSeconds(event.time_stamp()); |
return webkit_event; |
} |
@@ -351,7 +355,8 @@ blink::WebGestureEvent MakeWebGestureEventFlingCancel() { |
// All other fields are ignored on a GestureFlingCancel event. |
gesture_event.type = blink::WebInputEvent::GestureFlingCancel; |
- gesture_event.timeStampSeconds = ui::EventTimeForNow().InSecondsF(); |
+ gesture_event.timeStampSeconds = |
+ ui::EventTimeStampToSeconds(ui::EventTimeForNow()); |
gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad; |
return gesture_event; |
} |
@@ -361,8 +366,8 @@ blink::WebMouseEvent MakeWebMouseEventFromAuraEvent( |
blink::WebMouseEvent webkit_event; |
webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); |
- webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
- |
+ webkit_event.timeStampSeconds = |
+ ui::EventTimeStampToSeconds(event.time_stamp()); |
webkit_event.button = blink::WebMouseEvent::ButtonNone; |
int button_flags = event.flags(); |
if (event.type() == ui::ET_MOUSE_PRESSED || |
@@ -416,7 +421,8 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( |
webkit_event.type = blink::WebInputEvent::MouseWheel; |
webkit_event.button = blink::WebMouseEvent::ButtonNone; |
webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); |
- webkit_event.timeStampSeconds = event.time_stamp().InSecondsF(); |
+ webkit_event.timeStampSeconds = |
+ ui::EventTimeStampToSeconds(event.time_stamp()); |
if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) { |
webkit_event.deltaX = event.y_offset(); |