Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs.

ui/events/blink/web_input_event.cc

 // Copyright 2016 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/blink/web_input_event.h"
 
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ skipping 72 matching lines @@
 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
     const base::NativeEvent& native_event,
     const base::TimeTicks& time_stamp) {
   return WebKeyboardEventBuilder::Build(
       native_event.hwnd, native_event.message, native_event.wParam,
       native_event.lParam, EventTimeStampToSeconds(time_stamp));
 }
 #endif  // defined(OS_WIN)
 
 blink::WebKeyboardEvent MakeWebKeyboardEventFromUiEvent(const KeyEvent& event) {
-  blink::WebKeyboardEvent webkit_event;
-
-  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags()) |
-                           DomCodeToWebInputEventModifiers(event.code());
-
+  blink::WebInputEvent::Type type = blink::WebInputEvent::Undefined;
   switch (event.type()) {
     case ET_KEY_PRESSED:
-      webkit_event.type = event.is_char() ? blink::WebInputEvent::Char
-                                          : blink::WebInputEvent::RawKeyDown;
+      type = event.is_char() ? blink::WebInputEvent::Char
+                             : blink::WebInputEvent::RawKeyDown;
       break;
     case ET_KEY_RELEASED:
-      webkit_event.type = blink::WebInputEvent::KeyUp;
+      type = blink::WebInputEvent::KeyUp;
       break;
     default:
       NOTREACHED();
   }
 
+  blink::WebKeyboardEvent webkit_event(
+      type, EventFlagsToWebEventModifiers(event.flags()) |
+                DomCodeToWebInputEventModifiers(event.code()),
+      EventTimeStampToSeconds(event.time_stamp()));
+
   if (webkit_event.modifiers & blink::WebInputEvent::AltKey)
     webkit_event.isSystemKey = true;
 
   // TODO(dtapuska): crbug.com/570388. Ozone appears to deliver
   // key_code events that aren't "located" for the keypad like
   // Windows and X11 do and blink expects.
   webkit_event.windowsKeyCode =
       NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code());
   webkit_event.nativeKeyCode =
       KeycodeConverter::DomCodeToNativeKeycode(event.code());
   webkit_event.domCode = static_cast<int>(event.code());
   webkit_event.domKey = static_cast<int>(event.GetDomKey());
   webkit_event.unmodifiedText[0] = event.GetUnmodifiedText();
   webkit_event.text[0] = event.GetText();
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
     const ScrollEvent& event) {
-  blink::WebMouseWheelEvent webkit_event;
+  blink::WebMouseWheelEvent webkit_event(
+      blink::WebInputEvent::MouseWheel,
+      EventFlagsToWebEventModifiers(event.flags()),
+      EventTimeStampToSeconds(event.time_stamp()));
 
-  webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::Button::NoButton;
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
   webkit_event.hasPreciseScrollingDeltas = true;
 
   float offset_ordinal_x = event.x_offset_ordinal();
   float offset_ordinal_y = event.y_offset_ordinal();
   webkit_event.deltaX = event.x_offset();
   webkit_event.deltaY = event.y_offset();
 
   if (offset_ordinal_x != 0.f && webkit_event.deltaX != 0.f)
     webkit_event.accelerationRatioX = offset_ordinal_x / webkit_event.deltaX;
   webkit_event.wheelTicksX = webkit_event.deltaX / MouseWheelEvent::kWheelDelta;
   webkit_event.wheelTicksY = webkit_event.deltaY / MouseWheelEvent::kWheelDelta;
   if (offset_ordinal_y != 0.f && webkit_event.deltaY != 0.f)
     webkit_event.accelerationRatioY = offset_ordinal_y / webkit_event.deltaY;
 
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
   return webkit_event;
 }
 
 blink::WebGestureEvent MakeWebGestureEventFromUiEvent(
     const ScrollEvent& event) {
-  blink::WebGestureEvent webkit_event;
-
+  blink::WebInputEvent::Type type = blink::WebInputEvent::Undefined;
   switch (event.type()) {
     case ET_SCROLL_FLING_START:
-      webkit_event.type = blink::WebInputEvent::GestureFlingStart;
-      webkit_event.data.flingStart.velocityX = event.x_offset();
-      webkit_event.data.flingStart.velocityY = event.y_offset();
+      type = blink::WebInputEvent::GestureFlingStart;
       break;
     case ET_SCROLL_FLING_CANCEL:
-      webkit_event.type = blink::WebInputEvent::GestureFlingCancel;
+      type = blink::WebInputEvent::GestureFlingCancel;
       break;
     case ET_SCROLL:
       NOTREACHED() << "Invalid gesture type: " << event.type();
       break;
     default:
       NOTREACHED() << "Unknown gesture type: " << event.type();
   }
 
+  blink::WebGestureEvent webkit_event(
+      type, EventFlagsToWebEventModifiers(event.flags()),
+      EventTimeStampToSeconds(event.time_stamp()));
   webkit_event.sourceDevice = blink::WebGestureDeviceTouchpad;
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
+  if (event.type() == ET_SCROLL_FLING_START) {
+    webkit_event.data.flingStart.velocityX = event.x_offset();
+    webkit_event.data.flingStart.velocityY = event.y_offset();
+  }
+
   return webkit_event;
 }
 
 blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event);
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
     const MouseWheelEvent& event);
 
 // General approach:
 //
 // Event only carries a subset of possible event data provided to UI by the host
@@ skipping 164 matching lines @@
 
   const gfx::Point screen_point =
       GetScreenLocationFromEvent(event, screen_location_callback);
   gesture_event.globalX = screen_point.x();
   gesture_event.globalY = screen_point.y();
 
   return gesture_event;
 }
 
 blink::WebGestureEvent MakeWebGestureEventFlingCancel() {
-  blink::WebGestureEvent gesture_event;
+  blink::WebGestureEvent gesture_event(
+      blink::WebInputEvent::GestureFlingCancel,
+      blink::WebInputEvent::NoModifiers,
+      EventTimeStampToSeconds(EventTimeForNow()));
 
   // All other fields are ignored on a GestureFlingCancel event.
-  gesture_event.type = blink::WebInputEvent::GestureFlingCancel;
-  gesture_event.timeStampSeconds = EventTimeStampToSeconds(EventTimeForNow());
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   return gesture_event;
 }
 
 blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event) {
-  blink::WebMouseEvent webkit_event;
+  blink::WebInputEvent::Type type = blink::WebInputEvent::Undefined;
+  int click_count = 0;
+  switch (event.type()) {
+    case ET_MOUSE_PRESSED:
+      type = blink::WebInputEvent::MouseDown;
+      click_count = event.GetClickCount();
+      break;
+    case ET_MOUSE_RELEASED:
+      type = blink::WebInputEvent::MouseUp;
+      click_count = event.GetClickCount();
+      break;
+    case ET_MOUSE_EXITED:
+// TODO(chaopeng) this fix only for chromeos now, should convert ET_MOUSE_EXITED
+// to MouseLeave when crbug.com/450631 fixed.
+#if defined(OS_CHROMEOS)
+      type = blink::WebInputEvent::MouseLeave;
+      break;
+#endif
+    case ET_MOUSE_ENTERED:
+    case ET_MOUSE_MOVED:
+    case ET_MOUSE_DRAGGED:
+      type = blink::WebInputEvent::MouseMove;
+      break;
+    default:
+      NOTIMPLEMENTED() << "Received unexpected event: " << event.type();
+      break;
+  }
 
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
+  blink::WebMouseEvent webkit_event(
+      type, EventFlagsToWebEventModifiers(event.flags()),
+      EventTimeStampToSeconds(event.time_stamp()));
   webkit_event.button = blink::WebMouseEvent::Button::NoButton;
   int button_flags = event.flags();
   if (event.type() == ET_MOUSE_PRESSED || event.type() == ET_MOUSE_RELEASED) {
     // We want to use changed_button_flags() for mouse pressed & released.
     // These flags can be used only if they are set which is not always the case
     // (see e.g. GetChangedMouseButtonFlagsFromNative() in events_win.cc).
     if (event.changed_button_flags())
       button_flags = event.changed_button_flags();
   }
   if (button_flags & EF_LEFT_MOUSE_BUTTON)
     webkit_event.button = blink::WebMouseEvent::Button::Left;
   if (button_flags & EF_MIDDLE_MOUSE_BUTTON)
     webkit_event.button = blink::WebMouseEvent::Button::Middle;
   if (button_flags & EF_RIGHT_MOUSE_BUTTON)
     webkit_event.button = blink::WebMouseEvent::Button::Right;
 
-  switch (event.type()) {
-    case ET_MOUSE_PRESSED:
-      webkit_event.type = blink::WebInputEvent::MouseDown;
-      webkit_event.clickCount = event.GetClickCount();
-      break;
-    case ET_MOUSE_RELEASED:
-      webkit_event.type = blink::WebInputEvent::MouseUp;
-      webkit_event.clickCount = event.GetClickCount();
-      break;
-    case ET_MOUSE_EXITED:
-// TODO(chaopeng) this fix only for chromeos now, should convert ET_MOUSE_EXITED
-// to MouseLeave when crbug.com/450631 fixed.
-#if defined(OS_CHROMEOS)
-      webkit_event.type = blink::WebInputEvent::MouseLeave;
-      break;
-#endif
-    case ET_MOUSE_ENTERED:
-    case ET_MOUSE_MOVED:
-    case ET_MOUSE_DRAGGED:
-      webkit_event.type = blink::WebInputEvent::MouseMove;
-      break;
-    default:
-      NOTIMPLEMENTED() << "Received unexpected event: " << event.type();
-      break;
-  }
-
+  webkit_event.clickCount = click_count;
   webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
   webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
   webkit_event.force = event.pointer_details().force;
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
     const MouseWheelEvent& event) {
-  blink::WebMouseWheelEvent webkit_event;
+  blink::WebMouseWheelEvent webkit_event(
+      blink::WebInputEvent::MouseWheel,
+      EventFlagsToWebEventModifiers(event.flags()),
+      EventTimeStampToSeconds(event.time_stamp()));
 
-  webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::Button::NoButton;
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
 
   webkit_event.deltaX = event.x_offset();
   webkit_event.deltaY = event.y_offset();
 
   webkit_event.wheelTicksX = webkit_event.deltaX / MouseWheelEvent::kWheelDelta;
   webkit_event.wheelTicksY = webkit_event.deltaY / MouseWheelEvent::kWheelDelta;
 
   webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
   webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
   webkit_event.force = event.pointer_details().force;
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
 
   return webkit_event;
 }
 
 }  // namespace ui