Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / events / ozone / evdev / touch_event_converter_evdev.h

diff --git a/src/ui/events/ozone/evdev/touch_event_converter_evdev.h b/src/ui/events/ozone/evdev/touch_event_converter_evdev.h
index eedb243..6b18ce0 100644 (file)
--- a/src/ui/events/ozone/evdev/touch_event_converter_evdev.h
+++ b/src/ui/events/ozone/evdev/touch_event_converter_evdev.h
@@ -27,9 +27,15 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
   };
   TouchEventConverterEvdev(int fd,
                            base::FilePath path,
+                           int id,
                            const EventDeviceInfo& info,
                            const EventDispatchCallback& dispatch);
-  virtual ~TouchEventConverterEvdev();
+  ~TouchEventConverterEvdev() override;
+
+  // EventConverterEvdev:
+  bool HasTouchscreen() const override;
+  gfx::Size GetTouchscreenSize() const override;
+  bool IsInternal() const override;
 
  private:
   friend class MockTouchEventConverterEvdev;
@@ -38,7 +44,7 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
   void Init(const EventDeviceInfo& info);
 
   // Overidden from base::MessagePumpLibevent::Watcher.
-  virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
+  void OnFileCanReadWithoutBlocking(int fd) override;
 
   virtual bool Reinitialize();
 
@@ -77,6 +83,9 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
   float y_min_pixels_;
   float y_num_pixels_;
 
+  // Size of the touchscreen as reported by the driver.
+  gfx::Size native_size_;
+
   // Touch point currently being updated from the /dev/input/event* stream.
   int current_slot_;
 
@@ -85,6 +94,8 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
   std::bitset<MAX_FINGERS> altered_slots_;
 
   struct InProgressEvents {
+    InProgressEvents();
+
     float x_;
     float y_;
     int id_;  // Device reported "unique" touch point id; -1 means not active
@@ -99,6 +110,8 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
   // In-progress touch points.
   InProgressEvents events_[MAX_FINGERS];
 
+  bool is_internal_;
+
   DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev);
 };