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

Unified Diff: ui/events/gesture_detection/scale_gesture_detector.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: Store motion_event_id, not touch_id. 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/scale_gesture_detector.h
diff --git a/ui/events/gesture_detection/scale_gesture_detector.h b/ui/events/gesture_detection/scale_gesture_detector.h
index 9e84ca5e34fa0e1ff93f25d1dbb739aa22d67d4e..054723db1152ed57aa41ecd0f2f14043dc849444 100644
--- a/ui/events/gesture_detection/scale_gesture_detector.h
+++ b/ui/events/gesture_detection/scale_gesture_detector.h
@@ -32,9 +32,12 @@ class ScaleGestureDetector : public GestureDetector::SimpleGestureListener {
class ScaleGestureListener {
public:
virtual ~ScaleGestureListener() {}
- virtual bool OnScale(const ScaleGestureDetector& detector) = 0;
- virtual bool OnScaleBegin(const ScaleGestureDetector& detector) = 0;
- virtual void OnScaleEnd(const ScaleGestureDetector& detector) = 0;
+ virtual bool OnScale(const ScaleGestureDetector& detector,
+ const MotionEvent& e) = 0;
+ virtual bool OnScaleBegin(const ScaleGestureDetector& detector,
+ const MotionEvent& e) = 0;
+ virtual void OnScaleEnd(const ScaleGestureDetector& detector,
+ const MotionEvent& e) = 0;
};
// A convenience class to extend when you only want to listen for a subset of
@@ -46,9 +49,12 @@ class ScaleGestureDetector : public GestureDetector::SimpleGestureListener {
class SimpleScaleGestureListener : public ScaleGestureListener {
public:
// ScaleGestureListener implementation.
- virtual bool OnScale(const ScaleGestureDetector&) OVERRIDE;
- virtual bool OnScaleBegin(const ScaleGestureDetector&) OVERRIDE;
- virtual void OnScaleEnd(const ScaleGestureDetector&) OVERRIDE;
+ virtual bool OnScale(const ScaleGestureDetector&,
+ const MotionEvent&) OVERRIDE;
+ virtual bool OnScaleBegin(const ScaleGestureDetector&,
+ const MotionEvent&) OVERRIDE;
+ virtual void OnScaleEnd(const ScaleGestureDetector&,
+ const MotionEvent&) OVERRIDE;
};
ScaleGestureDetector(const Config& config, ScaleGestureListener* listener);

Powered by Google App Engine
This is Rietveld 408576698