Add POINTER_WHEEL_CHANGED event to mojo.

ui/events/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/events/event.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 
@@ skipping 480 matching lines @@
 
     case ET_POINTER_EXITED:
       SetType(ET_MOUSE_EXITED);
       break;
 
     case ET_POINTER_UP:
       SetType(ET_MOUSE_RELEASED);
       break;
 
     case ET_POINTER_WHEEL_CHANGED:
-      SetType(ET_MOUSEWHEEL);
+      // Explicitly not setting a type here. MouseWheelEvent should be converted
+      // from PointerEvent using its own ctor.
       break;
 
     case ET_POINTER_CAPTURE_CHANGED:
       SetType(ET_MOUSE_CAPTURE_CHANGED);
       break;
 
     default:
       NOTREACHED();
   }
 }
@@ skipping 107 matching lines @@
   else if (flags() & EF_IS_DOUBLE_CLICK)
     return 2;
   else
     return 1;
 }
 
 void MouseEvent::SetClickCount(int click_count) {
   if (type() != ET_MOUSE_PRESSED && type() != ET_MOUSE_RELEASED)
     return;
 
-  DCHECK(click_count > 0);
-  DCHECK(click_count <= 3);
+  DCHECK_LT(0, click_count);
+  DCHECK_GE(3, click_count);
 
   int f = flags();
   switch (click_count) {
     case 1:
       f &= ~EF_IS_DOUBLE_CLICK;
       f &= ~EF_IS_TRIPLE_CLICK;
       break;
     case 2:
       f |= EF_IS_DOUBLE_CLICK;
       f &= ~EF_IS_TRIPLE_CLICK;
@@ skipping 14 matching lines @@
       offset_(GetMouseWheelOffset(native_event)) {
 }
 
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
     : MouseEvent(scroll_event),
       offset_(gfx::ToRoundedInt(scroll_event.x_offset()),
               gfx::ToRoundedInt(scroll_event.y_offset())) {
   SetType(ET_MOUSEWHEEL);
 }
 
+MouseWheelEvent::MouseWheelEvent(const PointerEvent& pointer_event)
+    : MouseEvent(pointer_event),
+      offset_(pointer_event.pointer_details().offset.x(),
+              pointer_event.pointer_details().offset.y()) {
+  SetType(ET_MOUSEWHEEL);
+}
+
 MouseWheelEvent::MouseWheelEvent(const MouseEvent& mouse_event,
                                  int x_offset,
                                  int y_offset)
     : MouseEvent(mouse_event), offset_(x_offset, y_offset) {
   SetType(ET_MOUSEWHEEL);
 }
 
 MouseWheelEvent::MouseWheelEvent(const MouseWheelEvent& mouse_wheel_event)
     : MouseEvent(mouse_wheel_event),
       offset_(mouse_wheel_event.offset()) {
-  DCHECK(type() == ET_MOUSEWHEEL);
+  DCHECK_EQ(ET_MOUSEWHEEL, type());
 }
 
 MouseWheelEvent::MouseWheelEvent(const gfx::Vector2d& offset,
                                  const gfx::Point& location,
                                  const gfx::Point& root_location,
                                  base::TimeTicks time_stamp,
                                  int flags,
                                  int changed_button_flags)
     : MouseEvent(ui::ET_UNKNOWN,
                  location,
@@ skipping 459 matching lines @@
 
 base::char16 KeyEvent::GetCharacter() const {
   // Determination of key_ may be done lazily.
   if (key_ == DomKey::NONE)
     ApplyLayout();
   if (key_.IsCharacter()) {
     // Historically ui::KeyEvent has held only BMP characters.
     // Until this explicitly changes, require |key_| to hold a BMP character.
     DomKey::Base utf32_character = key_.ToCharacter();
     base::char16 ucs2_character = static_cast<base::char16>(utf32_character);
-    DCHECK(static_cast<DomKey::Base>(ucs2_character) == utf32_character);
+    DCHECK_EQ(static_cast<DomKey::Base>(ucs2_character), utf32_character);
     // Check if the control character is down. Note that ALTGR is represented
     // on Windows as CTRL|ALT, so we need to make sure that is not set.
     if ((flags() & (EF_ALTGR_DOWN | EF_CONTROL_DOWN)) == EF_CONTROL_DOWN) {
       // For a control character, key_ contains the corresponding printable
       // character. To preserve existing behaviour for now, return the control
       // character here; this will likely change -- see e.g. crbug.com/471488.
       if (ucs2_character >= 0x20 && ucs2_character <= 0x7E)
         return ucs2_character & 0x1F;
       if (ucs2_character == '\r')
         return '\n';
@@ skipping 140 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details),
       unique_touch_event_id_(unique_touch_event_id) {}
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui