Index: ui/base/event.cc |
diff --git a/ui/base/event.cc b/ui/base/event.cc |
index 7ba1f24ac5299eacc9fcf5bb6ea81c5a0d0d7df9..62e7c229213ff6b703e104c29285c3aa9570e231 100644 |
--- a/ui/base/event.cc |
+++ b/ui/base/event.cc |
@@ -97,7 +97,8 @@ LocatedEvent::LocatedEvent(const base::NativeEvent& native_event) |
EventTypeFromNative(native_event), |
EventFlagsFromNative(native_event)), |
location_(EventLocationFromNative(native_event)), |
- root_location_(location_) { |
+ root_location_(location_), |
+ system_location_(ui::EventSystemLocationFromNative(native_event)) { |
} |
LocatedEvent::LocatedEvent(EventType type, |
@@ -106,13 +107,15 @@ LocatedEvent::LocatedEvent(EventType type, |
int flags) |
: Event(type, flags), |
location_(location), |
- root_location_(root_location) { |
+ root_location_(root_location), |
+ system_location_(-1, -1) { |
} |
LocatedEvent::LocatedEvent(const LocatedEvent& model) |
: Event(model), |
location_(model.location_), |
- root_location_(model.root_location_) { |
+ root_location_(model.root_location_), |
+ system_location_(model.system_location_) { |
} |
void LocatedEvent::UpdateForRootTransform(const Transform& root_transform) { |
@@ -240,9 +243,9 @@ TouchEvent::TouchEvent(const base::NativeEvent& native_event) |
} |
TouchEvent::TouchEvent(EventType type, |
- const gfx::Point& location, |
- int touch_id, |
- base::TimeDelta time_stamp) |
+ const gfx::Point& location, |
+ int touch_id, |
+ base::TimeDelta time_stamp) |
: LocatedEvent(type, location, location, 0), |
touch_id_(touch_id), |
radius_x_(0.0f), |