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

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

Issue 2723023005: Make sure resent events that don't match ids are not coalesced. (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « ui/events/blink/blink_event_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 260f63682f5b71207f0cf759307bf7d4a9752ea5..a42f8b443437a0fa6cd038f4e005014bb84f3d6c 100644
--- a/ui/events/blink/blink_event_util_unittest.cc
+++ b/ui/events/blink/blink_event_util_unittest.cc
@@ -155,4 +155,50 @@ TEST(BlinkEventUtilTest, TouchEventCoalescing) {
EXPECT_EQ(6, coalesced_event.touches[0].movementY);
}
+TEST(BlinkEventUtilTest, WebMouseWheelEventCoalescing) {
+ blink::WebMouseWheelEvent coalesced_event(
+ blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
+ blink::WebInputEvent::TimeStampForTesting);
+ coalesced_event.deltaX = 1;
+ coalesced_event.deltaY = 1;
+
+ blink::WebMouseWheelEvent event_to_be_coalesced(
+ blink::WebInputEvent::MouseWheel, blink::WebInputEvent::NoModifiers,
+ blink::WebInputEvent::TimeStampForTesting);
+ event_to_be_coalesced.deltaX = 3;
+ event_to_be_coalesced.deltaY = 4;
+
+ EXPECT_TRUE(CanCoalesce(event_to_be_coalesced, coalesced_event));
+ Coalesce(event_to_be_coalesced, &coalesced_event);
+ EXPECT_EQ(4, coalesced_event.deltaX);
+ EXPECT_EQ(5, coalesced_event.deltaY);
+
+ event_to_be_coalesced.resendingPluginId = 3;
+ EXPECT_FALSE(CanCoalesce(event_to_be_coalesced, coalesced_event));
+}
+
+TEST(BlinkEventUtilTest, WebGestureEventCoalescing) {
+ blink::WebGestureEvent coalesced_event(
+ blink::WebInputEvent::GestureScrollUpdate,
+ blink::WebInputEvent::NoModifiers,
+ blink::WebInputEvent::TimeStampForTesting);
+ coalesced_event.data.scrollUpdate.deltaX = 1;
+ coalesced_event.data.scrollUpdate.deltaY = 1;
+
+ blink::WebGestureEvent event_to_be_coalesced(
+ blink::WebInputEvent::GestureScrollUpdate,
+ blink::WebInputEvent::NoModifiers,
+ blink::WebInputEvent::TimeStampForTesting);
+ event_to_be_coalesced.data.scrollUpdate.deltaX = 3;
+ event_to_be_coalesced.data.scrollUpdate.deltaY = 4;
+
+ EXPECT_TRUE(CanCoalesce(event_to_be_coalesced, coalesced_event));
+ Coalesce(event_to_be_coalesced, &coalesced_event);
+ EXPECT_EQ(4, coalesced_event.data.scrollUpdate.deltaX);
+ EXPECT_EQ(5, coalesced_event.data.scrollUpdate.deltaY);
+
+ event_to_be_coalesced.resendingPluginId = 3;
+ EXPECT_FALSE(CanCoalesce(event_to_be_coalesced, coalesced_event));
+}
+
} // namespace ui
« no previous file with comments | « ui/events/blink/blink_event_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698