| Index: ui/aura/event.cc
|
| ===================================================================
|
| --- ui/aura/event.cc (revision 126124)
|
| +++ ui/aura/event.cc (working copy)
|
| @@ -378,9 +378,21 @@
|
| base::Time time_stamp,
|
| float delta_x,
|
| float delta_y)
|
| + : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), flags) {
|
| + properties_.delta_x = delta_x;
|
| + properties_.delta_y = delta_y;
|
| + // XXX: Why is aura::Event::time_stamp_ a TimeDelta instead of a Time?
|
| + set_time_stamp(base::TimeDelta::FromSeconds(time_stamp.ToDoubleT()));
|
| +}
|
| +
|
| +GestureEvent::GestureEvent(ui::EventType type,
|
| + int x,
|
| + int y,
|
| + int flags,
|
| + base::Time time_stamp,
|
| + const GestureEvent::Properties& properties)
|
| : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), flags),
|
| - delta_x_(delta_x),
|
| - delta_y_(delta_y) {
|
| + properties_(properties) {
|
| // XXX: Why is aura::Event::time_stamp_ a TimeDelta instead of a Time?
|
| set_time_stamp(base::TimeDelta::FromSeconds(time_stamp.ToDoubleT()));
|
| }
|
| @@ -389,8 +401,7 @@
|
| Window* source,
|
| Window* target)
|
| : LocatedEvent(model, source, target),
|
| - delta_x_(model.delta_x_),
|
| - delta_y_(model.delta_y_) {
|
| + properties_(model.properties_) {
|
| }
|
|
|
| } // namespace aura
|
|
|