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

Unified Diff: ui/events/blink/blink_event_util.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 | « no previous file | ui/events/blink/blink_event_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/blink_event_util.cc
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index ac5a14aa438e64447b6d164dd6e5e71aa0ce581e..f382fc1ce5bbc1f5519eed6dcbe3a358a0180828 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -261,6 +261,7 @@ bool CanCoalesce(const WebMouseWheelEvent& event_to_coalesce,
event.scrollByPage == event_to_coalesce.scrollByPage &&
event.phase == event_to_coalesce.phase &&
event.momentumPhase == event_to_coalesce.momentumPhase &&
+ event.resendingPluginId == event_to_coalesce.resendingPluginId &&
event.hasPreciseScrollingDeltas ==
event_to_coalesce.hasPreciseScrollingDeltas;
}
@@ -347,6 +348,7 @@ void Coalesce(const WebTouchEvent& event_to_coalesce, WebTouchEvent* event) {
bool CanCoalesce(const WebGestureEvent& event_to_coalesce,
const WebGestureEvent& event) {
if (event.type() != event_to_coalesce.type() ||
+ event.resendingPluginId != event_to_coalesce.resendingPluginId ||
event.sourceDevice != event_to_coalesce.sourceDevice ||
event.modifiers() != event_to_coalesce.modifiers())
return false;
« no previous file with comments | « no previous file | ui/events/blink/blink_event_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698