Overhaul Mandoline event transport code

ui/mojo/events/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 "ui/mojo/events/input_event_constants.mojom";
 import "ui/mojo/events/input_key_codes.mojom";
 import "ui/mojo/geometry/geometry.mojom";
 
@@ skipping 29 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 LocationData {
+  // |x| and |y| are in the coordinate system of the View.
+  // Typically, this will be an integer-valued translation w.r.t.
+  // the screen and in this case, |x| and |y| are in units of physical
+  // pixels. However, some View embedders may apply arbitrary transformations
+  // of a view w.r.t. the screen.
+  float x;
+  float y;
+  // |screen_x| and |screen_y| are in screen coordinates in units of
+  // physical pixels.
+  float screen_x;
+  float screen_y;
+};
+
+// TODO(rjkroege,sadrul): Add gesture representation.
 struct PointerData {
   int32 pointer_id;
   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;
+  LocationData where;

[sky, 2015/09/14 19:27:26]

'where' is a weird name for this (same with line 80 below). How about location?

[rjkroege, 2015/09/14 21:07:38]

Done.

+  // Some devices (e.g. pen, finger) can extend across multiple pixels
+  // at once. |brush_data| provides additional data for this case and
+  // is available when |kind| is PEN or TOUCH.
+  BrushData? brush_data;
+};
+
+// Information payload to support
+// https://developer.mozilla.org/en-US/docs/Web/Events/wheel.
+// TODO(rjkroege): Handle MacOS momentum scrolling.
+struct WheelData {
+  WheelMode mode;
+  LocationData where;
+  // |delta_x|, |delta_y|, |delta_z| can be in units of pixels, lines, pages
+  // or control scaling as controlled by |mode|. Pixel scroll is physical
+  // pixels in the coordinate system of the target View.
+  float delta_x;
+  float delta_y;
+  float delta_z;
+};
+
+// Supplementary data to support pointers where the pointer can
+// cover multiple pixels per http://www.w3.org/TR/pointerevents/
+struct BrushData {
+  // |width| and |height| are in CSS pixels in the coordinate system of
+  // the target View.
+  float width;
+  float height;
+  // |pressure| range is [0,1]. For devices like mice buttons where the
+  // pressure is not available, it will be set to 0.5 if the button is down.
   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;
+  // |tiltY| and |tiltX| are in degrees.
+  float tiltY;
+  float tiltZ;
 };
 
 struct Event {
   // TODO(sky): rename to type.
   EventType action;
   // TODO(sky): parts of this should move to PointerData.
   EventFlags flags;
   // Time in microseconds from when the platform was started.
   // This value accurately orders events w.r.t. to each other but
   // does not position them at an absolute time.
   int64 time_stamp;
   KeyData? key_data;
   PointerData? pointer_data;
+  // Some devices (e.g. trackpads or mice) have additional valuators
+  // such as the mouse wheel or ball. Present only if action is WHEEL.
+  WheelData? wheel_data;
 };