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

Unified Diff: ui/events/gesture_detection/gesture_event_data.cc

Issue 212663010: Store the id of a contributing motion event in GestureEventData (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update test. Created 6 years, 9 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/gesture_detection/gesture_event_data.h ('k') | ui/events/gesture_detection/gesture_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/gesture_event_data.cc
diff --git a/ui/events/gesture_detection/gesture_event_data.cc b/ui/events/gesture_detection/gesture_event_data.cc
index 345b630e4b0984b15bf9a8324736546e50eb4404..8750c248e0edfb2f6cb7d5a4671d9c035e3f15bf 100644
--- a/ui/events/gesture_detection/gesture_event_data.cc
+++ b/ui/events/gesture_detection/gesture_event_data.cc
@@ -9,23 +9,33 @@
namespace ui {
GestureEventData::GestureEventData(EventType type,
+ int motion_event_id,
base::TimeTicks time,
float x,
float y,
const GestureEventDetails& details)
- : type(type), time(time), x(x), y(y), details(details) {
+ : type(type),
+ motion_event_id(motion_event_id),
+ time(time),
+ x(x),
+ y(y),
+ details(details) {
+ DCHECK(motion_event_id >= 0);
DCHECK(ET_GESTURE_TYPE_START <= type && type <= ET_GESTURE_TYPE_END);
}
GestureEventData::GestureEventData(EventType type,
+ int motion_event_id,
base::TimeTicks time,
float x,
float y)
: type(type),
+ motion_event_id(motion_event_id),
time(time),
x(x),
y(y),
details(GestureEventDetails(type, 0, 0)) {
+ DCHECK(motion_event_id >= 0);
DCHECK(ET_GESTURE_TYPE_START <= type && type <= ET_GESTURE_TYPE_END);
}
« no previous file with comments | « ui/events/gesture_detection/gesture_event_data.h ('k') | ui/events/gesture_detection/gesture_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698