| Index: ui/base/events/event.cc
|
| diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc
|
| index cffc21f7767e6fe5281a99ece577572bd49d1455..fee16025b11ff2419ecc978d4d5f23502c21c62c 100644
|
| --- a/ui/base/events/event.cc
|
| +++ b/ui/base/events/event.cc
|
| @@ -244,6 +244,14 @@ LocatedEvent::LocatedEvent(const base::NativeEvent& native_event)
|
| system_location_(ui::EventSystemLocationFromNative(native_event)) {
|
| }
|
|
|
| +LocatedEvent::LocatedEvent(const LocatedEvent& model)
|
| + : Event(model),
|
| + location_(model.location_),
|
| + root_location_(model.root_location_),
|
| + valid_system_location_(model.valid_system_location_),
|
| + system_location_(model.system_location_) {
|
| +}
|
| +
|
| LocatedEvent::LocatedEvent(EventType type,
|
| const gfx::Point& location,
|
| const gfx::Point& root_location,
|
| @@ -640,12 +648,16 @@ ScrollEvent::ScrollEvent(const base::NativeEvent& native_event)
|
|
|
| ScrollEvent::ScrollEvent(EventType type,
|
| const gfx::Point& location,
|
| + base::TimeDelta time_stamp,
|
| int flags,
|
| float x_offset,
|
| - float y_offset)
|
| + float y_offset,
|
| + int finger_count)
|
| : MouseEvent(type, location, location, flags),
|
| x_offset_(x_offset),
|
| - y_offset_(y_offset) {
|
| + y_offset_(y_offset),
|
| + finger_count_(finger_count) {
|
| + set_time_stamp(time_stamp);
|
| CHECK(IsScrollEvent());
|
| }
|
|
|
| @@ -664,7 +676,11 @@ GestureEvent::GestureEvent(EventType type,
|
| base::TimeDelta time_stamp,
|
| const GestureEventDetails& details,
|
| unsigned int touch_ids_bitfield)
|
| - : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), time_stamp, flags),
|
| + : LocatedEvent(type,
|
| + gfx::Point(x, y),
|
| + gfx::Point(x, y),
|
| + time_stamp,
|
| + flags | EF_FROM_TOUCH),
|
| details_(details),
|
| touch_ids_bitfield_(touch_ids_bitfield) {
|
| }
|
|
|