Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

ui/base/event.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
@@ skipping 209 matching lines @@
       f &= ~EF_IS_DOUBLE_CLICK;
       f |= EF_IS_TRIPLE_CLICK;
       break;
   }
   set_flags(f);
 }
 
 MouseEvent::MouseEvent(const MouseEvent& model) : LocatedEvent(model) {
 }
 
+MouseWheelEvent::MouseWheelEvent(const NativeEvent& native_event)
+#if defined(USE_AURA)
+    : MouseEvent(static_cast<const MouseEvent&>(*native_event)),
+      offset_(GetMouseWheelOffset(native_event->native_event())) {
+#else
+    : MouseEvent(native_event),
+      offset_(GetMouseWheelOffset(native_event)) {
+#endif
+}
+
+MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
+    : MouseEvent(scroll_event),
+      offset_(scroll_event.y_offset()) {
+  set_type(ET_MOUSEWHEEL);
+}
+
+#if defined(OS_WIN)
+// This value matches windows WHEEL_DELTA.
+// static
+const int MouseWheelEvent::kWheelDelta = 120;
+#else
+// This value matches GTK+ wheel scroll amount.
+const int MouseWheelEvent::kWheelDelta = 53;
+#endif
+
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
-      touch_id_(ui::GetTouchId(native_event)),
+      touch_id_(GetTouchId(native_event)),
       radius_x_(GetTouchRadiusX(native_event)),
       radius_y_(GetTouchRadiusY(native_event)),
       rotation_angle_(GetTouchAngle(native_event)),
       force_(GetTouchForce(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),
       radius_y_(0.0f),
       rotation_angle_(0.0f),
       force_(0.0f) {
   set_time_stamp(time_stamp);
 }
 
 TouchEvent::~TouchEvent() {
 }
 
 void TouchEvent::UpdateForRootTransform(const Transform& root_transform) {
   LocatedEvent::UpdateForRootTransform(root_transform);
   gfx::Point3f scale;
   InterpolatedTransform::FactorTRS(root_transform, NULL, NULL, &scale);
   if (scale.x())
     radius_x_ /= scale.x();
   if (scale.y())
     radius_y_ /= scale.y();
 }
 
+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(const base::NativeEvent& native_event, bool is_char)
     : Event(native_event,
             EventTypeFromNative(native_event),
             EventFlagsFromNative(native_event)),
       key_code_(KeyboardCodeFromNative(native_event)),
       is_char_(is_char),
       character_(0),
       unmodified_character_(0) {
 }
 
@@ skipping 120 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace ui