Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Unified Diff: ui/events/blink/input_scroll_elasticity_controller_unittest.cc

Issue 2569273002: Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs. (Closed)
Patch Set: Rebase Created 3 years, 12 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
Index: ui/events/blink/input_scroll_elasticity_controller_unittest.cc
diff --git a/ui/events/blink/input_scroll_elasticity_controller_unittest.cc b/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
index 6349947572f2f6236b0b4cc6b77e2b099b8d75f6..3ad1c182cee185fede5aef24118c90f9b6b0319a 100644
--- a/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
+++ b/ui/events/blink/input_scroll_elasticity_controller_unittest.cc
@@ -88,13 +88,14 @@ class ScrollElasticityControllerTest : public testing::Test {
void SendGestureScrollBegin(InertialPhaseState inertialPhase) {
- blink::WebGestureEvent event;
+ TickCurrentTime();
+ blink::WebGestureEvent event(
+ blink::WebInputEvent::GestureScrollBegin,
+ blink::WebInputEvent::NoModifiers,
+ (current_time_ - base::TimeTicks()).InSecondsF());
event.sourceDevice = blink::WebGestureDeviceTouchpad;
- event.type = blink::WebInputEvent::GestureScrollBegin;
event.data.scrollBegin.inertialPhase =
static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase);
- TickCurrentTime();
- event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF();
controller_.ObserveGestureEventAndResult(event,
cc::InputHandlerScrollResult());
@@ -105,15 +106,16 @@ class ScrollElasticityControllerTest : public testing::Test {
InertialPhaseState inertialPhase,
const gfx::Vector2dF& event_delta = gfx::Vector2dF(),
const gfx::Vector2dF& overscroll_delta = gfx::Vector2dF()) {
- blink::WebGestureEvent event;
+ TickCurrentTime();
+ blink::WebGestureEvent event(
+ blink::WebInputEvent::GestureScrollUpdate,
+ blink::WebInputEvent::NoModifiers,
+ (current_time_ - base::TimeTicks()).InSecondsF());
event.sourceDevice = blink::WebGestureDeviceTouchpad;
- event.type = blink::WebInputEvent::GestureScrollUpdate;
event.data.scrollUpdate.inertialPhase =
static_cast<blink::WebGestureEvent::InertialPhaseState>(inertialPhase);
event.data.scrollUpdate.deltaX = -event_delta.x();
event.data.scrollUpdate.deltaY = -event_delta.y();
- TickCurrentTime();
- event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF();
cc::InputHandlerScrollResult scroll_result;
scroll_result.did_overscroll_root = !overscroll_delta.IsZero();
@@ -124,12 +126,12 @@ class ScrollElasticityControllerTest : public testing::Test {
}
void SendGestureScrollEnd() {
- blink::WebGestureEvent event;
- event.sourceDevice = blink::WebGestureDeviceTouchpad;
- event.type = blink::WebInputEvent::GestureScrollEnd;
-
TickCurrentTime();
- event.timeStampSeconds = (current_time_ - base::TimeTicks()).InSecondsF();
+ blink::WebGestureEvent event(
+ blink::WebInputEvent::GestureScrollEnd,
+ blink::WebInputEvent::NoModifiers,
+ (current_time_ - base::TimeTicks()).InSecondsF());
+ event.sourceDevice = blink::WebGestureDeviceTouchpad;
controller_.ObserveGestureEventAndResult(event,
cc::InputHandlerScrollResult());

Powered by Google App Engine
This is Rietveld 408576698