ozone: Handle on-screen stylus support consistently

ui/events/ozone/evdev/tablet_event_converter_evdev.h

Index: ui/events/ozone/evdev/tablet_event_converter_evdev.h
diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev.h b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
index fa03e12562a6333e03fac67c1c94c06fcf98157b..c655f124a0a34c90685fa0e05fbfbfd1ca9a7f70 100644
--- a/ui/events/ozone/evdev/tablet_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev.h
@@ -41,11 +41,12 @@ class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
   void ConvertKeyEvent(const input_event& input);
   void ConvertAbsEvent(const input_event& input);
   void DispatchMouseButton(const input_event& input);
+  void DispatchTouch(const input_event& input);
   void UpdateCursor();
 
   // Flush events delimited by EV_SYN. This is useful for handling
   // non-axis-aligned movement properly.
-  void FlushEvents();
+  void FlushEvents(const input_event& input);
 
   // Controller for watching the input fd.
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
@@ -61,10 +62,13 @@ class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
 
   int y_abs_location_;
   int x_abs_location_;
+  int pressure_;
   int x_abs_min_;
   int y_abs_min_;
+  int pressure_min_;
   int x_abs_range_;
   int y_abs_range_;
+  int pressure_range_;
 
   // BTN_TOOL_ code for the active device
   int stylus_;
@@ -72,6 +76,12 @@ class EVENTS_OZONE_EVDEV_EXPORT TabletEventConverterEvdev
   // Whether we need to move the cursor
   bool abs_value_dirty_;
 
+  // For on-screen active stylus generate touch events
+  bool on_screen_stylus_;
+
+  // Emit touch events for motion vs mouse
+  bool emit_touch_;
+
   DISALLOW_COPY_AND_ASSIGN(TabletEventConverterEvdev);
 };