Commit 7ce5fd6a authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix autoscrolling moving to quickly.

Synthetic events injected had a static timestamp. In
https://chromium-review.googlesource.com/c/chromium/src/+/2235936
static timestamps were used but the real timestamp should be used.
This change reverts the code back to the original.

BUG=1122950

Change-Id: I52a825365fe658ab8803fea8e6ffb908b77b719b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398971Reviewed-by: default avatarJeremy Roman <jbroman@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805839}
parent d5e233ea
...@@ -12,7 +12,7 @@ namespace blink { ...@@ -12,7 +12,7 @@ namespace blink {
WebMouseEvent SyntheticWebMouseEventBuilder::Build( WebMouseEvent SyntheticWebMouseEventBuilder::Build(
blink::WebInputEvent::Type type) { blink::WebInputEvent::Type type) {
return WebMouseEvent(type, WebInputEvent::kNoModifiers, return WebMouseEvent(type, WebInputEvent::kNoModifiers,
WebInputEvent::GetStaticTimeStampForTests()); ui::EventTimeForNow());
} }
WebMouseEvent SyntheticWebMouseEventBuilder::Build( WebMouseEvent SyntheticWebMouseEventBuilder::Build(
...@@ -22,8 +22,7 @@ WebMouseEvent SyntheticWebMouseEventBuilder::Build( ...@@ -22,8 +22,7 @@ WebMouseEvent SyntheticWebMouseEventBuilder::Build(
int modifiers, int modifiers,
blink::WebPointerProperties::PointerType pointer_type) { blink::WebPointerProperties::PointerType pointer_type) {
DCHECK(WebInputEvent::IsMouseEventType(type)); DCHECK(WebInputEvent::IsMouseEventType(type));
WebMouseEvent result(type, modifiers, WebMouseEvent result(type, modifiers, ui::EventTimeForNow());
WebInputEvent::GetStaticTimeStampForTests());
result.SetPositionInWidget(window_x, window_y); result.SetPositionInWidget(window_x, window_y);
result.SetPositionInScreen(window_x, window_y); result.SetPositionInScreen(window_x, window_y);
result.SetModifiers(modifiers); result.SetModifiers(modifiers);
...@@ -35,8 +34,7 @@ WebMouseEvent SyntheticWebMouseEventBuilder::Build( ...@@ -35,8 +34,7 @@ WebMouseEvent SyntheticWebMouseEventBuilder::Build(
WebMouseWheelEvent SyntheticWebMouseWheelEventBuilder::Build( WebMouseWheelEvent SyntheticWebMouseWheelEventBuilder::Build(
WebMouseWheelEvent::Phase phase) { WebMouseWheelEvent::Phase phase) {
WebMouseWheelEvent result(WebInputEvent::Type::kMouseWheel, WebMouseWheelEvent result(WebInputEvent::Type::kMouseWheel,
WebInputEvent::kNoModifiers, WebInputEvent::kNoModifiers, ui::EventTimeForNow());
WebInputEvent::GetStaticTimeStampForTests());
result.phase = phase; result.phase = phase;
result.event_action = result.event_action =
WebMouseWheelEvent::GetPlatformSpecificDefaultEventAction(result); WebMouseWheelEvent::GetPlatformSpecificDefaultEventAction(result);
...@@ -63,7 +61,7 @@ WebMouseWheelEvent SyntheticWebMouseWheelEventBuilder::Build( ...@@ -63,7 +61,7 @@ WebMouseWheelEvent SyntheticWebMouseWheelEventBuilder::Build(
int modifiers, int modifiers,
ui::ScrollGranularity delta_units) { ui::ScrollGranularity delta_units) {
WebMouseWheelEvent result(WebInputEvent::Type::kMouseWheel, modifiers, WebMouseWheelEvent result(WebInputEvent::Type::kMouseWheel, modifiers,
WebInputEvent::GetStaticTimeStampForTests()); ui::EventTimeForNow());
result.SetPositionInScreen(global_x, global_y); result.SetPositionInScreen(global_x, global_y);
result.SetPositionInWidget(x, y); result.SetPositionInWidget(x, y);
result.delta_units = delta_units; result.delta_units = delta_units;
...@@ -84,9 +82,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::Build( ...@@ -84,9 +82,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::Build(
blink::WebGestureDevice source_device, blink::WebGestureDevice source_device,
int modifiers) { int modifiers) {
DCHECK(WebInputEvent::IsGestureEventType(type)); DCHECK(WebInputEvent::IsGestureEventType(type));
WebGestureEvent result(type, modifiers, WebGestureEvent result(type, modifiers, ui::EventTimeForNow(), source_device);
WebInputEvent::GetStaticTimeStampForTests(),
source_device);
if (type == WebInputEvent::Type::kGestureTap || if (type == WebInputEvent::Type::kGestureTap ||
type == WebInputEvent::Type::kGestureTapUnconfirmed || type == WebInputEvent::Type::kGestureTapUnconfirmed ||
type == WebInputEvent::Type::kGestureDoubleTap) { type == WebInputEvent::Type::kGestureDoubleTap) {
...@@ -152,7 +148,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::BuildFling( ...@@ -152,7 +148,7 @@ WebGestureEvent SyntheticWebGestureEventBuilder::BuildFling(
SyntheticWebTouchEvent::SyntheticWebTouchEvent() : WebTouchEvent() { SyntheticWebTouchEvent::SyntheticWebTouchEvent() : WebTouchEvent() {
unique_touch_event_id = ui::GetNextTouchEventId(); unique_touch_event_id = ui::GetNextTouchEventId();
SetTimestamp(WebInputEvent::GetStaticTimeStampForTests()); SetTimestamp(ui::EventTimeForNow());
pointer_id_ = 0; pointer_id_ = 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment