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

Unified Diff: ui/aura/gestures/gesture_point.h

Issue 9452024: Gestures are now possible using touch events with any ids (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Allow consecutive touch presses with the same touch-id. Created 8 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 | « ash/wm/root_window_event_filter_unittest.cc ('k') | ui/aura/gestures/gesture_point.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/gestures/gesture_point.h
diff --git a/ui/aura/gestures/gesture_point.h b/ui/aura/gestures/gesture_point.h
index b04ffbd9460e891986f6ae5d70f7473e9ee1524c..906ba487cc5d5cb2f2f44c0206a07e48342979dd 100644
--- a/ui/aura/gestures/gesture_point.h
+++ b/ui/aura/gestures/gesture_point.h
@@ -53,8 +53,16 @@ class GesturePoint {
double last_touch_time() const { return last_touch_time_; }
const gfx::Point& last_touch_position() const { return last_touch_position_; }
- void set_touch_id(unsigned int touch_id) { touch_id_ = touch_id; }
- unsigned int touch_id() const { return touch_id_; }
+ // point_id_ is used to drive GestureSequence::ProcessTouchEventForGesture.
+ // point_ids are maintained such that the set of point_ids is always
+ // contiguous, from 0 to the number of current touches.
+ // A lower point_id indicates that a touch occurred first.
+ // A negative point_id indicates that the GesturePoint is not currently
+ // associated with a touch.
+ void set_point_id(int point_id) { point_id_ = point_id; }
+ const int point_id() const { return point_id_; }
dhollowa 2012/03/02 22:23:13 This use of const failed to compile on clang. For
+
+ const bool in_use() const { return point_id_ >= 0; }
double x_delta() const {
return last_touch_position_.x() - first_touch_position_.x();
@@ -87,7 +95,7 @@ class GesturePoint {
VelocityCalculator velocity_calculator_;
- unsigned int touch_id_;
+ int point_id_;
DISALLOW_COPY_AND_ASSIGN(GesturePoint);
};
« no previous file with comments | « ash/wm/root_window_event_filter_unittest.cc ('k') | ui/aura/gestures/gesture_point.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698