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

third_party/WebKit/public/platform/WebInputEvent.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 176 matching lines @@
 
     ScrollLockOn = 1 << 18,
 
     // The set of non-stateful modifiers that specifically change the
     // interpretation of the key being pressed. For example; IsLeft,
     // IsRight, IsComposing don't change the meaning of the key
     // being pressed. NumLockOn, ScrollLockOn, CapsLockOn are stateful
     // and don't indicate explicit depressed state.
     KeyModifiers =
         SymbolKey | FnKey | AltGrKey | MetaKey | AltKey | ControlKey | ShiftKey,
+    NoModifiers = 0,
   };
 
   // Indicates whether the browser needs to block on the ACK result for
   // this event, and if not, why (for metrics/diagnostics purposes).
   // These values are direct mappings of the values in PlatformEvent
   // so the values can be cast between the enumerations. static_asserts
   // checking this are in web/WebInputEventConversion.cpp.
   enum DispatchType {
     // Event can be canceled.
     Blocking,
@@ skipping 14 matching lines @@
   // expected to stick. If this axis is set to Free, then scrolling is not
   // stuck to any axis.
   enum RailsMode {
     RailsModeFree = 0,
     RailsModeHorizontal = 1,
     RailsModeVertical = 2,
   };
 
   static const int InputModifiers = ShiftKey | ControlKey | AltKey | MetaKey;
 
+  static constexpr double TimeStampForTesting = 123.0;
+
   double timeStampSeconds;  // Seconds since platform start with microsecond
                             // resolution.
   unsigned size;            // The size of this structure, for serialization.
   Type type;
   int modifiers;
 
   // Returns true if the WebInputEvent |type| is a mouse event.
   static bool isMouseEventType(int type) {
     return MouseTypeFirst <= type && type <= MouseTypeLast;
   }
@@ skipping 28 matching lines @@
   BLINK_COMMON_EXPORT static const char* GetName(WebInputEvent::Type);
 
   float frameScale() const { return m_frameScale; }
   void setFrameScale(float scale) { m_frameScale = scale; }
 
   WebFloatPoint frameTranslate() const { return m_frameTranslate; }
   void setFrameTranslate(WebFloatPoint translate) {
     m_frameTranslate = translate;
   }
 
+  void setType(Type typeParam) { type = typeParam; }
+
+  void setModifiers(int modifiersParam) { modifiers = modifiersParam; }
+
+  void setTimeStampSeconds(double seconds) { timeStampSeconds = seconds; }
+
  protected:
   // The root frame scale.
   float m_frameScale;
 
   // The root frame translation (applied post scale).
   WebFloatPoint m_frameTranslate;
 
-  explicit WebInputEvent(unsigned sizeParam) {
+  WebInputEvent(unsigned sizeParam,
+                Type typeParam,
+                int modifiersParam,
+                double timeStampSecondsParam) {
+    memset(this, 0, sizeParam);
+    timeStampSeconds = timeStampSecondsParam;
+    size = sizeParam;
+    type = typeParam;
+    modifiers = modifiersParam;
+#if DCHECK_IS_ON()
+    // If dcheck is on force failures if frame scale is not initialized
+    // correctly by causing DIV0.
+    m_frameScale = 0;
+#else
+    m_frameScale = 1;
+#endif
+  }
+
+  WebInputEvent(unsigned sizeParam) {
     memset(this, 0, sizeParam);
     timeStampSeconds = 0.0;
     size = sizeParam;
     type = Undefined;
-    modifiers = 0;
 #if DCHECK_IS_ON()
     // If dcheck is on force failures if frame scale is not initialized
     // correctly by causing DIV0.
     m_frameScale = 0;
 #else
     m_frameScale = 1;
 #endif
   }
 };
 
@@ skipping 42 matching lines @@
 
   // |text| is the text generated by this keystroke.  |unmodifiedText| is
   // |text|, but unmodified by an concurrently-held modifiers (except
   // shift).  This is useful for working out shortcut keys.  Linux and
   // Windows guarantee one character per event.  The Mac does not, but in
   // reality that's all it ever gives.  We're generous, and cap it a bit
   // longer.
   WebUChar text[textLengthCap];
   WebUChar unmodifiedText[textLengthCap];
 
-  WebKeyboardEvent()
-      : WebInputEvent(sizeof(WebKeyboardEvent)),
-        windowsKeyCode(0),
-        nativeKeyCode(0),
-        isSystemKey(false),
-        isBrowserShortcut(false) {
-  }
+  WebKeyboardEvent(Type type, int modifiers, double timeStampSeconds)
+      : WebInputEvent(sizeof(WebKeyboardEvent),
+                      type,
+                      modifiers,
+                      timeStampSeconds) {}
+
+  WebKeyboardEvent() : WebInputEvent(sizeof(WebKeyboardEvent)) {}
 
   // Please refer to bug http://b/issue?id=961192, which talks about Webkit
   // keyboard event handling changes. It also mentions the list of keys
   // which don't have associated character events.
   bool isCharacterKey() const {
     // TODO(dtapuska): Determine if we can remove this method and just
     // not actually generate events for these instead of filtering them out.
     switch (windowsKeyCode) {
       case 0x08:  // VK_BACK
       case 0x1b:  // VK_ESCAPE
@@ skipping 18 matching lines @@
   int windowY;
 
   // Screen coordinate
   int globalX;
   int globalY;
 
   int movementX;
   int movementY;
   int clickCount;
 
+  WebMouseEvent(Type type, int modifiers, double timeStampSeconds)
+      : WebInputEvent(sizeof(WebMouseEvent), type, modifiers, timeStampSeconds),
+        WebPointerProperties() {}
+
   WebMouseEvent()
-      : WebInputEvent(sizeof(WebMouseEvent)),
-        WebPointerProperties(),
-        x(0),
-        y(0),
-        windowX(0),
-        windowY(0),
-        globalX(0),
-        globalY(0),
-        movementX(0),
-        movementY(0),
-        clickCount(0) {}
+      : WebInputEvent(sizeof(WebMouseEvent)), WebPointerProperties() {}
 
  protected:
   explicit WebMouseEvent(unsigned sizeParam)
-      : WebInputEvent(sizeParam),
-        WebPointerProperties(),
-        x(0),
-        y(0),
-        windowX(0),
-        windowY(0),
-        globalX(0),
-        globalY(0),
-        movementX(0),
-        movementY(0),
-        clickCount(0) {}
+      : WebInputEvent(sizeParam), WebPointerProperties() {}
+
+  WebMouseEvent(unsigned sizeParam,
+                Type type,
+                int modifiers,
+                double timeStampSeconds)
+      : WebInputEvent(sizeParam, type, modifiers, timeStampSeconds),
+        WebPointerProperties() {}
 };
 
 // WebTouchEvent --------------------------------------------------------------
 
 // TODO(e_hakkinen): Replace with WebPointerEvent. crbug.com/508283
 class WebTouchEvent : public WebInputEvent {
  public:
   // Maximum number of simultaneous touches supported on
   // Ash/Aura.
   enum { kTouchesLengthCap = 16 };
@@ skipping 13 matching lines @@
 
   // Whether this touch event is a touchstart or a first touchmove event per
   // scroll.
   bool touchStartOrFirstTouchMove;
 
   // A unique identifier for the touch event. Valid ids start at one and
   // increase monotonically. Zero means an unknown id.
   uint32_t uniqueTouchEventId;
 
   WebTouchEvent()
-      : WebInputEvent(sizeof(WebTouchEvent)),
-        touchesLength(0),
-        dispatchType(Blocking),
-        movedBeyondSlopRegion(false),
-        touchStartOrFirstTouchMove(false),
-        uniqueTouchEventId(0) {}
+      : WebInputEvent(sizeof(WebTouchEvent)), dispatchType(Blocking) {}
+
+  WebTouchEvent(Type type, int modifiers, double timeStampSeconds)
+      : WebInputEvent(sizeof(WebTouchEvent), type, modifiers, timeStampSeconds),
+        dispatchType(Blocking) {}
 };
 
 #pragma pack(pop)
 
 }  // namespace blink
 
 #endif