| Index: ui/events/blink/blink_event_util_unittest.cc
|
| diff --git a/ui/events/blink/blink_event_util_unittest.cc b/ui/events/blink/blink_event_util_unittest.cc
|
| index e4dab1075821f5b95baa68d4a5a9b5003d8da07b..047c239f9873f05b63610140bb93e66d63e8146a 100644
|
| --- a/ui/events/blink/blink_event_util_unittest.cc
|
| +++ b/ui/events/blink/blink_event_util_unittest.cc
|
| @@ -28,4 +28,30 @@ TEST(BlinkEventUtilTest, NoScalingWith1DSF) {
|
| EXPECT_TRUE(ScaleWebInputEvent(event, 2.f));
|
| }
|
|
|
| +TEST(BlinkEventUtilTest, TouchEventCoalescing) {
|
| + blink::WebTouchPoint touchPoint;
|
| + touchPoint.id = 1;
|
| + touchPoint.state = blink::WebTouchPoint::StateMoved;
|
| +
|
| + blink::WebTouchEvent coalesced_event;
|
| + coalesced_event.setType(blink::WebInputEvent::TouchMove);
|
| + touchPoint.movementX = 5;
|
| + touchPoint.movementY = 10;
|
| + coalesced_event.touches[coalesced_event.touchesLength++] =
|
| + touchPoint;
|
| +
|
| + blink::WebTouchEvent event_to_be_coalesced;
|
| + event_to_be_coalesced.setType(blink::WebInputEvent::TouchMove);
|
| + touchPoint.movementX = 3;
|
| + touchPoint.movementY = -4;
|
| + event_to_be_coalesced.touches[event_to_be_coalesced.touchesLength++] =
|
| + touchPoint;
|
| +
|
| + EXPECT_TRUE(CanCoalesce(event_to_be_coalesced, coalesced_event));
|
| + Coalesce(event_to_be_coalesced, &coalesced_event);
|
| + EXPECT_EQ(8, coalesced_event.touches[0].movementX);
|
| + EXPECT_EQ(6, coalesced_event.touches[0].movementY);
|
| +
|
| +}
|
| +
|
| } // namespace ui
|
|
|