Index: ui/events/event.h |
diff --git a/ui/events/event.h b/ui/events/event.h |
index d774897bcf29e287165f45f317035d00a11aec9f..f7e0b30ec99456ebfd24738be3285c95bf4c6c09 100644 |
--- a/ui/events/event.h |
+++ b/ui/events/event.h |
@@ -490,8 +490,8 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent { |
radius_x_(model.radius_x_), |
radius_y_(model.radius_y_), |
rotation_angle_(model.rotation_angle_), |
- force_(model.force_) { |
- } |
+ force_(model.force_), |
+ may_cause_scrolling_(model.may_cause_scrolling_) {} |
TouchEvent(EventType type, |
const gfx::PointF& location, |
@@ -516,6 +516,9 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent { |
float rotation_angle() const { return rotation_angle_; } |
float force() const { return force_; } |
+ void set_may_cause_scrolling(bool causes) { may_cause_scrolling_ = causes; } |
+ bool may_cause_scrolling() const { return may_cause_scrolling_; } |
+ |
// Used for unit tests. |
void set_radius_x(const float r) { radius_x_ = r; } |
void set_radius_y(const float r) { radius_y_ = r; } |
@@ -552,6 +555,10 @@ class EVENTS_EXPORT TouchEvent : public LocatedEvent { |
// Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0. |
float force_; |
+ |
+ // Whether the (unhandled) touch event will produce a scroll event (i.e., it's |
+ // a touchmove and exceeds the platform slop region). Defaults to false. |
+ bool may_cause_scrolling_; |
}; |
// An interface that individual platforms can use to store additional data on |