Index: ui/base/events/event.cc |
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc |
index f16d471625f3d4a2bff23d009c4c30a8023a55ee..96a7e7dc5f6f13a8fe8225d34ef2c1dab5f81b17 100644 |
--- a/ui/base/events/event.cc |
+++ b/ui/base/events/event.cc |
@@ -307,6 +307,23 @@ TouchEvent::TouchEvent(EventType type, |
set_time_stamp(time_stamp); |
} |
+TouchEvent::TouchEvent(EventType type, |
+ const gfx::Point& location, |
+ int flags, |
+ int touch_id, |
+ base::TimeDelta timestamp, |
+ float radius_x, |
+ float radius_y, |
+ float angle, |
+ float force) |
+ : LocatedEvent(type, location, location, flags), |
+ touch_id_(touch_id), |
+ radius_x_(radius_x), |
+ radius_y_(radius_y), |
+ rotation_angle_(angle), |
+ force_(force) { |
+} |
+ |
TouchEvent::~TouchEvent() { |
} |
@@ -326,25 +343,6 @@ void TouchEvent::UpdateForRootTransform(const gfx::Transform& root_transform) { |
} |
//////////////////////////////////////////////////////////////////////////////// |
-// TestTouchEvent |
- |
-TestTouchEvent::TestTouchEvent(EventType type, |
- int x, |
- int y, |
- int flags, |
- int touch_id, |
- float radius_x, |
- float radius_y, |
- float angle, |
- float force) |
- : TouchEvent(type, gfx::Point(x, y), touch_id, base::TimeDelta()) { |
- set_flags(flags); |
- set_radius(radius_x, radius_y); |
- set_rotation_angle(angle); |
- set_force(force); |
-} |
- |
-//////////////////////////////////////////////////////////////////////////////// |
// KeyEvent |
KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char) |