| Index: ui/events/event.h
|
| diff --git a/ui/events/event.h b/ui/events/event.h
|
| index 57871944c0655c5e6e49c0fed482e13b979c89d1..2545fae0d8dbadcc4ab433c557fb473a928c2d11 100644
|
| --- a/ui/events/event.h
|
| +++ b/ui/events/event.h
|
| @@ -211,7 +211,7 @@ class EVENTS_EXPORT Event {
|
| void StopPropagation();
|
| bool stopped_propagation() const { return !!(result_ & ER_CONSUMED); }
|
|
|
| - // Marks the event as having been handled. A handled event does not reach the
|
| +
|
| // next event phase. For example, if an event is handled during the pre-target
|
| // phase, then the event is dispatched to all pre-target handlers, but not to
|
| // the target or post-target handlers.
|
| @@ -493,7 +493,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,
|
| @@ -521,6 +522,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; }
|
| @@ -566,6 +570,11 @@ 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 (e.g., a
|
| + // touchmove that exceeds the platform slop region, or a touchend that
|
| + // causes a fling). Defaults to false.
|
| + bool may_cause_scrolling_;
|
| };
|
|
|
| // An interface that individual platforms can use to store additional data on
|
|
|