Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Unified Diff: ui/events/event.h

Issue 680413006: Re-enable Eager Gesture Recognition on Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address sadrul's comments. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/chromeos/touch_exploration_controller.cc ('k') | ui/events/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event.h
diff --git a/ui/events/event.h b/ui/events/event.h
index 427a731c0a203a44500cdbf1eadb34c60be0feb3..57871944c0655c5e6e49c0fed482e13b979c89d1 100644
--- a/ui/events/event.h
+++ b/ui/events/event.h
@@ -489,11 +489,11 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
TouchEvent(const TouchEvent& model, T* source, T* target)
: LocatedEvent(model, source, target),
touch_id_(model.touch_id_),
+ unique_event_id_(model.unique_event_id_),
radius_x_(model.radius_x_),
radius_y_(model.radius_y_),
rotation_angle_(model.rotation_angle_),
- force_(model.force_) {
- }
+ force_(model.force_) {}
TouchEvent(EventType type,
const gfx::PointF& location,
@@ -512,7 +512,10 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
~TouchEvent() override;
+ // The id of the pointer this event modifies.
int touch_id() const { return touch_id_; }
+ // A unique identifier for this event.
+ uint64 unique_event_id() const { return unique_event_id_; }
float radius_x() const { return radius_x_; }
float radius_y() const { return radius_y_; }
float rotation_angle() const { return rotation_angle_; }
@@ -526,6 +529,12 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
void UpdateForRootTransform(
const gfx::Transform& inverted_root_transform) override;
+ // Marks the event as not participating in synchronous gesture recognition.
+ void DisableSynchronousHandling();
+ bool synchronous_handling_disabled() const {
+ return !!(result() & ER_DISABLE_SYNC_HANDLING);
+ }
+
protected:
void set_radius(float radius_x, float radius_y) {
radius_x_ = radius_x;
@@ -543,6 +552,9 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent {
// for each separable additional touch that the hardware can detect.
const int touch_id_;
+ // A unique identifier for the touch event.
+ const uint64 unique_event_id_;
+
// Radius of the X (major) axis of the touch ellipse. 0.0 if unknown.
float radius_x_;
« no previous file with comments | « ui/chromeos/touch_exploration_controller.cc ('k') | ui/events/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698