ash: Record some additional information about the gestures.

ui/base/gestures/gesture_types.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_BASE_GESTURES_GESTURE_TYPES_H_
 #define UI_BASE_GESTURES_GESTURE_TYPES_H_
 
 #include "base/logging.h"
 #include "base/time.h"
 #include "ui/base/events.h"
 
 namespace ui {
 
 struct UI_EXPORT GestureEventDetails {
  public:
   GestureEventDetails(EventType type, float delta_x, float delta_y);
 
+  EventType type() const { return type_; }
+
+  int touch_points() const { return touch_points_; }
+  void set_touch_points(int touch_points) { touch_points_ = touch_points; }
+
   float scroll_x() const {
     CHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
     return data.scroll.x;
   }
   float scroll_y() const {
     CHECK_EQ(ui::ET_GESTURE_SCROLL_UPDATE, type_);
     return data.scroll.y;
   }
 
   float velocity_x() const {
@@ skipping 12 matching lines @@
   float radius_y() const {
     CHECK_EQ(ui::ET_GESTURE_TAP, type_);
     return data.radius.y;
   }
 
   int touch_id() const {
     CHECK_EQ(ui::ET_GESTURE_LONG_PRESS, type_);
     return data.touch_id;
   }
 
-  int touch_points() const {
-    DCHECK(type_ == ui::ET_GESTURE_BEGIN || type_ == ui::ET_GESTURE_END);
-    return data.touch_points;
-  }
-
   float scale() const {
     CHECK_EQ(ui::ET_GESTURE_PINCH_UPDATE, type_);
     return data.scale;
   }
 
   bool swipe_left() const {
     CHECK_EQ(ui::ET_GESTURE_MULTIFINGER_SWIPE, type_);
     return data.swipe.left;
   }
   bool swipe_right() const {
@@ skipping 32 matching lines @@
       float y;
     } velocity;
 
     struct {  // TAP radius.
       float x;
       float y;
     } radius;
 
     int touch_id;  // LONG_PRESS touch-id.
 
-    int touch_points;  // Number of active touch points for BEGIN/END.
-
     struct {  // SWIPE direction.
       bool left;
       bool right;
       bool up;
       bool down;
     } swipe;
 
     struct {
       float delta_x;
       float delta_y;
     } generic;
   } data;
+
+  int touch_points_;  // Number of active touch points in the gesture.
 };
 
 // An abstract type to represent touch-events. The gesture-recognizer uses this
 // interface to communicate with the touch-events.
 class UI_EXPORT TouchEvent {
  public:
   virtual ~TouchEvent() {}
 
   virtual EventType GetEventType() const = 0;
   virtual gfx::Point GetLocation() const = 0;
@@ skipping 49 matching lines @@
 
 // GestureEventHelper creates implementation-specific gesture events and
 // can dispatch them.
 class UI_EXPORT GestureEventHelper {
  public:
   virtual ~GestureEventHelper() {
   }
 
   // |flags| is ui::EventFlags. The meaning of |param_first| and |param_second|
   // depends on the specific gesture type (|type|).
-  virtual GestureEvent* CreateGestureEvent(EventType type,
+  virtual GestureEvent* CreateGestureEvent(const GestureEventDetails& details,
                                            const gfx::Point& location,
                                            int flags,
                                            base::Time time,
-                                           float param_first,
-                                           float param_second,
                                            unsigned int touch_id_bitfield) = 0;
 
   virtual TouchEvent* CreateTouchEvent(EventType type,
                                        const gfx::Point& location,
                                        int touch_id,
                                        base::TimeDelta time_stamp) = 0;
 
   virtual bool DispatchLongPressGestureEvent(GestureEvent* event) = 0;
   virtual bool DispatchCancelTouchEvent(TouchEvent* event) = 0;
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_GESTURES_GESTURE_TYPES_H_