| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/aura/event.h" | 5 #include "ui/aura/event.h" |
| 6 | 6 |
| 7 #if defined(USE_X11) | 7 #if defined(USE_X11) |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 ui::GetScrollOffsets(native_event, &x_offset_, &y_offset_); | 371 ui::GetScrollOffsets(native_event, &x_offset_, &y_offset_); |
| 372 } | 372 } |
| 373 | 373 |
| 374 GestureEvent::GestureEvent(ui::EventType type, | 374 GestureEvent::GestureEvent(ui::EventType type, |
| 375 int x, | 375 int x, |
| 376 int y, | 376 int y, |
| 377 int flags, | 377 int flags, |
| 378 base::Time time_stamp, | 378 base::Time time_stamp, |
| 379 float delta_x, | 379 float delta_x, |
| 380 float delta_y) | 380 float delta_y) |
| 381 : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), flags), | 381 : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), flags) { |
| 382 delta_x_(delta_x), | 382 properties_.delta_x = delta_x; |
| 383 delta_y_(delta_y) { | 383 properties_.delta_y = delta_y; |
| 384 // XXX: Why is aura::Event::time_stamp_ a TimeDelta instead of a Time? | 384 // XXX: Why is aura::Event::time_stamp_ a TimeDelta instead of a Time? |
| 385 set_time_stamp(base::TimeDelta::FromSeconds(time_stamp.ToDoubleT())); | 385 set_time_stamp(base::TimeDelta::FromSeconds(time_stamp.ToDoubleT())); |
| 386 } | 386 } |
| 387 |
| 388 GestureEvent::GestureEvent(ui::EventType type, |
| 389 int x, |
| 390 int y, |
| 391 int flags, |
| 392 base::Time time_stamp, |
| 393 const GestureEvent::Properties& properties) |
| 394 : LocatedEvent(type, gfx::Point(x, y), gfx::Point(x, y), flags), |
| 395 properties_(properties) { |
| 396 // XXX: Why is aura::Event::time_stamp_ a TimeDelta instead of a Time? |
| 397 set_time_stamp(base::TimeDelta::FromSeconds(time_stamp.ToDoubleT())); |
| 398 } |
| 387 | 399 |
| 388 GestureEvent::GestureEvent(const GestureEvent& model, | 400 GestureEvent::GestureEvent(const GestureEvent& model, |
| 389 Window* source, | 401 Window* source, |
| 390 Window* target) | 402 Window* target) |
| 391 : LocatedEvent(model, source, target), | 403 : LocatedEvent(model, source, target), |
| 392 delta_x_(model.delta_x_), | 404 properties_(model.properties_) { |
| 393 delta_y_(model.delta_y_) { | |
| 394 } | 405 } |
| 395 | 406 |
| 396 } // namespace aura | 407 } // namespace aura |
| OLD | NEW |