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

Unified Diff: ui/events/gesture_detection/mock_motion_event.h

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
Index: ui/events/gesture_detection/mock_motion_event.h
diff --git a/ui/events/gesture_detection/mock_motion_event.h b/ui/events/gesture_detection/mock_motion_event.h
index f52b849a6b5dbccd3a0c0712d5782bb0054dfd34..9793494e28e3c532daea57d46646fea732f7c256 100644
--- a/ui/events/gesture_detection/mock_motion_event.h
+++ b/ui/events/gesture_detection/mock_motion_event.h
@@ -28,6 +28,7 @@ struct MockMotionEvent : public MotionEvent {
virtual Action GetAction() const OVERRIDE;
virtual int GetActionIndex() const OVERRIDE;
virtual size_t GetPointerCount() const OVERRIDE;
+ virtual int GetId() const OVERRIDE;
virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
virtual float GetX(size_t pointer_index) const OVERRIDE;
virtual float GetY(size_t pointer_index) const OVERRIDE;
@@ -48,6 +49,7 @@ struct MockMotionEvent : public MotionEvent {
virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE;
// Utility methods.
+ void SetId(int new_id);
void PressPoint(float x, float y);
void MovePoint(size_t index, float x, float y);
void ReleasePoint();
@@ -57,6 +59,7 @@ struct MockMotionEvent : public MotionEvent {
size_t pointer_count;
gfx::PointF points[MAX_POINTERS];
base::TimeTicks time;
+ int id;
};
} // namespace ui
« no previous file with comments | « ui/events/gesture_detection/gesture_provider_unittest.cc ('k') | ui/events/gesture_detection/mock_motion_event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698