| Index: third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
|
| diff --git a/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
|
| index 1cab57905ad4d7e5068391c1d40a762b4123e6d7..008626572d0efd09cb1db132d5128aa7f3c5c9f6 100644
|
| --- a/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
|
| +++ b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
|
| @@ -8,11 +8,6 @@ import "geometry/public/interfaces/geometry.mojom";
|
| import "input_events/public/interfaces/input_event_constants.mojom";
|
| import "input_events/public/interfaces/input_key_codes.mojom";
|
|
|
| -struct LocationData {
|
| - Point? in_view_location;
|
| - Point? screen_location;
|
| -};
|
| -
|
| struct KeyData {
|
| // The chromium event key code; these values are from the ui/ KeyCode enum,
|
| // which has the fun property of being neither consistently the Windows key
|
| @@ -52,47 +47,30 @@ struct KeyData {
|
| uint16 unmodified_text;
|
| };
|
|
|
| -struct TouchData {
|
| +struct PointerData {
|
| int32 pointer_id;
|
| -};
|
| -
|
| -struct GestureData {
|
| - // A bounding box for all the input events that contributed to this gesture.
|
| - RectF? bounding_box;
|
| -
|
| - // GESTURE_SCROLL_UPDATE
|
| - float scroll_x;
|
| - float scroll_y;
|
| -
|
| - // SCROLL_FLING_START
|
| - float velocity_x;
|
| - float velocity_y;
|
| -
|
| - // GESTURE_PINCH_UPDATE
|
| - float scale;
|
| -
|
| - // GESTURE_SWIPE
|
| - bool swipe_left;
|
| - bool swipe_right;
|
| - bool swipe_up;
|
| - bool swipe_down;
|
| -
|
| - // GESTURE_TAP and GESTURE_TAP_UNCONFIRMED and GESTURE_DOUBLE_TAP
|
| - int32 tap_count;
|
| -};
|
| -
|
| -struct MouseWheelData {
|
| - int32 x_offset;
|
| - int32 y_offset;
|
| + PointerKind kind;
|
| + // |x| and |y| are in the coordinate system of the View.
|
| + float x;
|
| + float y;
|
| + // |screen_x| and |screen_y| are in screen coordinates.
|
| + float screen_x;
|
| + float screen_y;
|
| + float pressure;
|
| + float radius_major;
|
| + float radius_minor;
|
| + float orientation;
|
| + // Used for devices that support wheels. Ranges from -1 to 1.
|
| + float horizontal_wheel;
|
| + float vertical_wheel;
|
| };
|
|
|
| struct Event {
|
| + // TODO(sky): rename to type.
|
| EventType action;
|
| + // TODO(sky): parts of this should move to PointerData.
|
| EventFlags flags;
|
| int64 time_stamp;
|
| - LocationData? location_data;
|
| KeyData? key_data;
|
| - TouchData? touch_data;
|
| - GestureData? gesture_data;
|
| - MouseWheelData? wheel_data;
|
| + PointerData? pointer_data;
|
| };
|
|
|