Update mojo sdk to rev cb6c5abfadfea0ca73dca466e2894554ac1ae144

third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom

 // Copyright 2014 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.
 
 module mojo;
 
 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
   // code, nor the X11 keycodes. (This value is consistent across platforms
   // for basic ASCII characters; it will differ for modifiers. We don't define
   // this as a mojo enum because mojom doesn't appear to have a platform
   // dependent preprocessor yet.)
   //
   // TODO(erg): Remove this, and declare Win32 keycodes correct by fiat. We can
   // not do this until we remove ui::Event usage from within mojo.
@@ skipping 19 matching lines @@
 
   // The text generated by this keystroke. Corresponds to
   // blink::WebKeyboardEvent::text.
   uint16 text;
 
   // Like |text|, but unmodified by concurrently held modifier keys (except
   // shift). Corresponds to blink::WebKeyboardEvent::unmodifiedText.
   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;
 };