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

third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 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 305 matching lines @@
 
   webViewImpl->setPageScaleFactor(2);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
   Document* document =
       toLocalFrame(webViewImpl->page()->mainFrame())->document();
   LocalDOMWindow* domWindow = document->domWindow();
   LayoutViewItem documentLayoutView = document->layoutViewItem();
 
   {
-    WebMouseEvent webMouseEvent;
-    webMouseEvent.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 10;
     webMouseEvent.windowX = 10;
     webMouseEvent.windowY = 10;
     webMouseEvent.globalX = 10;
     webMouseEvent.globalY = 10;
     webMouseEvent.movementX = 10;
     webMouseEvent.movementY = 10;
 
     PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
     EXPECT_EQ(5, platformMouseBuilder.position().x());
     EXPECT_EQ(5, platformMouseBuilder.position().y());
     EXPECT_EQ(10, platformMouseBuilder.globalPosition().x());
     EXPECT_EQ(10, platformMouseBuilder.globalPosition().y());
     EXPECT_EQ(5, platformMouseBuilder.movementDelta().x());
     EXPECT_EQ(5, platformMouseBuilder.movementDelta().y());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollUpdate,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.x = 10;
     webGestureEvent.y = 12;
     webGestureEvent.globalX = 20;
     webGestureEvent.globalY = 22;
     webGestureEvent.data.scrollUpdate.deltaX = 30;
     webGestureEvent.data.scrollUpdate.deltaY = 32;
     webGestureEvent.data.scrollUpdate.velocityX = 40;
     webGestureEvent.data.scrollUpdate.velocityY = 42;
     webGestureEvent.data.scrollUpdate.inertialPhase =
@@ skipping 10 matching lines @@
     // TODO: The velocity values may need to be scaled to page scale in
     // order to remain consist with delta values.
     EXPECT_EQ(40, platformGestureBuilder.velocityX());
     EXPECT_EQ(42, platformGestureBuilder.velocityY());
     EXPECT_EQ(ScrollInertialPhaseMomentum,
               platformGestureBuilder.inertialPhase());
     EXPECT_TRUE(platformGestureBuilder.preventPropagation());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureScrollEnd;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollEnd,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.x = 10;
     webGestureEvent.y = 12;
     webGestureEvent.globalX = 20;
     webGestureEvent.globalY = 22;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.position().x());
     EXPECT_EQ(6, platformGestureBuilder.position().y());
     EXPECT_EQ(20, platformGestureBuilder.globalPosition().x());
     EXPECT_EQ(22, platformGestureBuilder.globalPosition().y());
     EXPECT_EQ(ScrollInertialPhaseUnknown,
               platformGestureBuilder.inertialPhase());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTap;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTap,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.tap.width = 10;
     webGestureEvent.data.tap.height = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.area().width());
     EXPECT_EQ(5, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTapUnconfirmed;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTapUnconfirmed,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.tap.width = 10;
     webGestureEvent.data.tap.height = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.area().width());
     EXPECT_EQ(5, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTapDown;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTapDown,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.tapDown.width = 10;
     webGestureEvent.data.tapDown.height = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.area().width());
     EXPECT_EQ(5, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureShowPress;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureShowPress,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.showPress.width = 10;
     webGestureEvent.data.showPress.height = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.area().width());
     EXPECT_EQ(5, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureLongPress;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureLongPress,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.longPress.width = 10;
     webGestureEvent.data.longPress.height = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.area().width());
     EXPECT_EQ(5, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTwoFingerTap;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTwoFingerTap,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.twoFingerTap.firstFingerWidth = 10;
     webGestureEvent.data.twoFingerTap.firstFingerHeight = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5, platformGestureBuilder.area().width());
     EXPECT_EQ(5, platformGestureBuilder.area().height());
   }
 
   {
-    WebTouchEvent webTouchEvent;
-    webTouchEvent.type = WebInputEvent::TouchMove;
+    WebTouchEvent webTouchEvent(WebInputEvent::TouchMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webTouchEvent.touchesLength = 1;
     webTouchEvent.touches[0].state = WebTouchPoint::StateMoved;
     webTouchEvent.touches[0].screenPosition.x = 10.6f;
     webTouchEvent.touches[0].screenPosition.y = 10.4f;
     webTouchEvent.touches[0].position.x = 10.6f;
     webTouchEvent.touches[0].position.y = 10.4f;
     webTouchEvent.touches[0].radiusX = 10.6f;
     webTouchEvent.touches[0].radiusY = 10.4f;
 
     EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].screenPosition.x);
@@ skipping 118 matching lines @@
   webViewImpl->resize(WebSize(pageWidth, pageHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   webViewImpl->setPageScaleFactor(2);
   webViewImpl->mainFrameImpl()->setInputEventsTransformForEmulation(
       IntSize(10, 20), 1.5);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
-    WebMouseEvent webMouseEvent;
-    webMouseEvent.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 100;
     webMouseEvent.y = 110;
     webMouseEvent.windowX = 100;
     webMouseEvent.windowY = 110;
     webMouseEvent.globalX = 100;
     webMouseEvent.globalY = 110;
     webMouseEvent.movementX = 60;
     webMouseEvent.movementY = 60;
 
     PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
     EXPECT_EQ(30, platformMouseBuilder.position().x());
     EXPECT_EQ(30, platformMouseBuilder.position().y());
     EXPECT_EQ(100, platformMouseBuilder.globalPosition().x());
     EXPECT_EQ(110, platformMouseBuilder.globalPosition().y());
     EXPECT_EQ(20, platformMouseBuilder.movementDelta().x());
     EXPECT_EQ(20, platformMouseBuilder.movementDelta().y());
   }
 
   {
-    WebMouseEvent webMouseEvent1;
-    webMouseEvent1.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent1(WebInputEvent::MouseMove,
+                                 WebInputEvent::NoModifiers,
+                                 WebInputEvent::TimeStampForTesting);
     webMouseEvent1.x = 100;
     webMouseEvent1.y = 110;
     webMouseEvent1.windowX = 100;
     webMouseEvent1.windowY = 110;
     webMouseEvent1.globalX = 100;
     webMouseEvent1.globalY = 110;
     webMouseEvent1.movementX = 60;
     webMouseEvent1.movementY = 60;
 
     WebMouseEvent webMouseEvent2 = webMouseEvent1;
@@ skipping 19 matching lines @@
 
     EXPECT_EQ(30, coalescedevents[1].position().x());
     EXPECT_EQ(40, coalescedevents[1].position().y());
     EXPECT_EQ(100, coalescedevents[1].globalPosition().x());
     EXPECT_EQ(140, coalescedevents[1].globalPosition().y());
     EXPECT_EQ(20, coalescedevents[1].movementDelta().x());
     EXPECT_EQ(10, coalescedevents[1].movementDelta().y());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollUpdate,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.x = 100;
     webGestureEvent.y = 110;
     webGestureEvent.globalX = 100;
     webGestureEvent.globalY = 110;
     webGestureEvent.data.scrollUpdate.deltaX = 60;
     webGestureEvent.data.scrollUpdate.deltaY = 60;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(30, platformGestureBuilder.position().x());
     EXPECT_EQ(30, platformGestureBuilder.position().y());
     EXPECT_EQ(100, platformGestureBuilder.globalPosition().x());
     EXPECT_EQ(110, platformGestureBuilder.globalPosition().y());
     EXPECT_EQ(20, platformGestureBuilder.deltaX());
     EXPECT_EQ(20, platformGestureBuilder.deltaY());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTap;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTap,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.tap.width = 30;
     webGestureEvent.data.tap.height = 30;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(10, platformGestureBuilder.area().width());
     EXPECT_EQ(10, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTapUnconfirmed;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTapUnconfirmed,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.tap.width = 30;
     webGestureEvent.data.tap.height = 30;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(10, platformGestureBuilder.area().width());
     EXPECT_EQ(10, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTapDown;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTapDown,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.tapDown.width = 30;
     webGestureEvent.data.tapDown.height = 30;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(10, platformGestureBuilder.area().width());
     EXPECT_EQ(10, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureShowPress;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureShowPress,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.showPress.width = 30;
     webGestureEvent.data.showPress.height = 30;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(10, platformGestureBuilder.area().width());
     EXPECT_EQ(10, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureLongPress;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureLongPress,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.longPress.width = 30;
     webGestureEvent.data.longPress.height = 30;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(10, platformGestureBuilder.area().width());
     EXPECT_EQ(10, platformGestureBuilder.area().height());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTwoFingerTap;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTwoFingerTap,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.data.twoFingerTap.firstFingerWidth = 30;
     webGestureEvent.data.twoFingerTap.firstFingerHeight = 30;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(10, platformGestureBuilder.area().width());
     EXPECT_EQ(10, platformGestureBuilder.area().height());
   }
 
   {
-    WebTouchEvent webTouchEvent;
-    webTouchEvent.type = WebInputEvent::TouchMove;
+    WebTouchEvent webTouchEvent(WebInputEvent::TouchMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webTouchEvent.touchesLength = 1;
     webTouchEvent.touches[0].state = WebTouchPoint::StateMoved;
     webTouchEvent.touches[0].screenPosition.x = 100;
     webTouchEvent.touches[0].screenPosition.y = 110;
     webTouchEvent.touches[0].position.x = 100;
     webTouchEvent.touches[0].position.y = 110;
     webTouchEvent.touches[0].radiusX = 30;
     webTouchEvent.touches[0].radiusY = 30;
 
     PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
     EXPECT_FLOAT_EQ(100, platformTouchBuilder.touchPoints()[0].screenPos().x());
     EXPECT_FLOAT_EQ(110, platformTouchBuilder.touchPoints()[0].screenPos().y());
     EXPECT_FLOAT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().x());
     EXPECT_FLOAT_EQ(30, platformTouchBuilder.touchPoints()[0].pos().y());
     EXPECT_FLOAT_EQ(10, platformTouchBuilder.touchPoints()[0].radius().width());
     EXPECT_FLOAT_EQ(10,
                     platformTouchBuilder.touchPoints()[0].radius().height());
   }
 
   {
-    WebTouchEvent webTouchEvent1;
-    webTouchEvent1.type = WebInputEvent::TouchMove;
+    WebTouchEvent webTouchEvent1(WebInputEvent::TouchMove,
+                                 WebInputEvent::NoModifiers,
+                                 WebInputEvent::TimeStampForTesting);
     webTouchEvent1.touchesLength = 1;
     webTouchEvent1.touches[0].state = WebTouchPoint::StateMoved;
     webTouchEvent1.touches[0].screenPosition.x = 100;
     webTouchEvent1.touches[0].screenPosition.y = 110;
     webTouchEvent1.touches[0].position.x = 100;
     webTouchEvent1.touches[0].position.y = 110;
     webTouchEvent1.touches[0].radiusX = 30;
     webTouchEvent1.touches[0].radiusY = 30;
 
     WebTouchEvent webTouchEvent2 = webTouchEvent1;
@@ skipping 40 matching lines @@
   webViewImpl->resize(WebSize(pageWidth, pageHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
   Document* document =
       toLocalFrame(webViewImpl->page()->mainFrame())->document();
   LocalDOMWindow* domWindow = document->domWindow();
   LayoutViewItem documentLayoutView = document->layoutViewItem();
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureTap;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureTap,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.x = 10;
     webGestureEvent.y = 10;
     webGestureEvent.globalX = 10;
     webGestureEvent.globalY = 10;
     webGestureEvent.data.tap.tapCount = 1;
     webGestureEvent.data.tap.width = 10;
     webGestureEvent.data.tap.height = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
@@ skipping 33 matching lines @@
   webViewImpl->updateAllLifecyclePhases();
 
   webViewImpl->setPageScaleFactor(2);
 
   IntPoint visualOffset(35, 60);
   webViewImpl->page()->frameHost().visualViewport().setLocation(visualOffset);
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
-    WebMouseEvent webMouseEvent;
-    webMouseEvent.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 10;
     webMouseEvent.windowX = 10;
     webMouseEvent.windowY = 10;
     webMouseEvent.globalX = 10;
     webMouseEvent.globalY = 10;
 
     PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
     EXPECT_EQ(5 + visualOffset.x(), platformMouseBuilder.position().x());
     EXPECT_EQ(5 + visualOffset.y(), platformMouseBuilder.position().y());
     EXPECT_EQ(10, platformMouseBuilder.globalPosition().x());
     EXPECT_EQ(10, platformMouseBuilder.globalPosition().y());
   }
 
   {
-    WebMouseWheelEvent webMouseWheelEvent;
-    webMouseWheelEvent.type = WebInputEvent::MouseWheel;
+    WebMouseWheelEvent webMouseWheelEvent(WebInputEvent::MouseWheel,
+                                          WebInputEvent::NoModifiers,
+                                          WebInputEvent::TimeStampForTesting);
     webMouseWheelEvent.x = 10;
     webMouseWheelEvent.y = 10;
     webMouseWheelEvent.windowX = 10;
     webMouseWheelEvent.windowY = 10;
     webMouseWheelEvent.globalX = 10;
     webMouseWheelEvent.globalY = 10;
 
     PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
     EXPECT_EQ(5 + visualOffset.x(), platformWheelBuilder.position().x());
     EXPECT_EQ(5 + visualOffset.y(), platformWheelBuilder.position().y());
     EXPECT_EQ(10, platformWheelBuilder.globalPosition().x());
     EXPECT_EQ(10, platformWheelBuilder.globalPosition().y());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureScrollUpdate;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollUpdate,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
     webGestureEvent.x = 10;
     webGestureEvent.y = 10;
     webGestureEvent.globalX = 10;
     webGestureEvent.globalY = 10;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(5 + visualOffset.x(), platformGestureBuilder.position().x());
     EXPECT_EQ(5 + visualOffset.y(), platformGestureBuilder.position().y());
     EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
     EXPECT_EQ(10, platformGestureBuilder.globalPosition().y());
   }
 
   {
-    WebTouchEvent webTouchEvent;
-    webTouchEvent.type = WebInputEvent::TouchMove;
+    WebTouchEvent webTouchEvent(WebInputEvent::TouchMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webTouchEvent.touchesLength = 1;
     webTouchEvent.touches[0].state = WebTouchPoint::StateMoved;
     webTouchEvent.touches[0].screenPosition.x = 10.6f;
     webTouchEvent.touches[0].screenPosition.y = 10.4f;
     webTouchEvent.touches[0].position.x = 10.6f;
     webTouchEvent.touches[0].position.y = 10.4f;
 
     EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].screenPosition.x);
     EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].screenPosition.y);
     EXPECT_FLOAT_EQ(10.6f, webTouchEvent.touches[0].position.x);
@@ skipping 27 matching lines @@
   webViewImpl->updateAllLifecyclePhases();
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   FloatSize elasticOverscroll(10, -20);
   webViewImpl->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                    elasticOverscroll, 1.0f, 0.0f);
 
   // Just elastic overscroll.
   {
-    WebMouseEvent webMouseEvent;
-    webMouseEvent.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 50;
     webMouseEvent.windowX = 10;
     webMouseEvent.windowY = 50;
     webMouseEvent.globalX = 10;
     webMouseEvent.globalY = 50;
 
     PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
     EXPECT_EQ(webMouseEvent.x + elasticOverscroll.width(),
               platformMouseBuilder.position().x());
     EXPECT_EQ(webMouseEvent.y + elasticOverscroll.height(),
               platformMouseBuilder.position().y());
     EXPECT_EQ(webMouseEvent.globalX, platformMouseBuilder.globalPosition().x());
     EXPECT_EQ(webMouseEvent.globalY, platformMouseBuilder.globalPosition().y());
   }
 
   // Elastic overscroll and pinch-zoom (this doesn't actually ever happen,
   // but ensure that if it were to, the overscroll would be applied after the
   // pinch-zoom).
   float pageScale = 2;
   webViewImpl->setPageScaleFactor(pageScale);
   IntPoint visualOffset(35, 60);
   webViewImpl->page()->frameHost().visualViewport().setLocation(visualOffset);
   {
-    WebMouseEvent webMouseEvent;
-    webMouseEvent.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 10;
     webMouseEvent.windowX = 10;
     webMouseEvent.windowY = 10;
     webMouseEvent.globalX = 10;
     webMouseEvent.globalY = 10;
 
     PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
     EXPECT_EQ(webMouseEvent.x / pageScale + visualOffset.x() +
                   elasticOverscroll.width(),
@@ skipping 23 matching lines @@
   webViewImpl->updateAllLifecyclePhases();
 
   FloatSize elasticOverscroll(10, -20);
   webViewImpl->applyViewportDeltas(WebFloatSize(), WebFloatSize(),
                                    elasticOverscroll, 1.0f, 0.0f);
   FrameTestHelpers::reloadFrame(webViewHelper.webView()->mainFrame());
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   // Just elastic overscroll.
   {
-    WebMouseEvent webMouseEvent;
-    webMouseEvent.type = WebInputEvent::MouseMove;
+    WebMouseEvent webMouseEvent(WebInputEvent::MouseMove,
+                                WebInputEvent::NoModifiers,
+                                WebInputEvent::TimeStampForTesting);
     webMouseEvent.x = 10;
     webMouseEvent.y = 50;
     webMouseEvent.windowX = 10;
     webMouseEvent.windowY = 50;
     webMouseEvent.globalX = 10;
     webMouseEvent.globalY = 50;
 
     PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
     EXPECT_EQ(webMouseEvent.x + elasticOverscroll.width(),
               platformMouseBuilder.position().x());
@@ skipping 84 matching lines @@
   WebViewImpl* webViewImpl =
       webViewHelper.initializeAndLoad(baseURL + fileName, true);
   int pageWidth = 640;
   int pageHeight = 480;
   webViewImpl->resize(WebSize(pageWidth, pageHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
-    WebMouseWheelEvent webMouseWheelEvent;
-    webMouseWheelEvent.type = WebInputEvent::MouseWheel;
+    WebMouseWheelEvent webMouseWheelEvent(WebInputEvent::MouseWheel,
+                                          WebInputEvent::ControlKey,
+                                          WebInputEvent::TimeStampForTesting);
     webMouseWheelEvent.x = 0;
     webMouseWheelEvent.y = 5;
     webMouseWheelEvent.deltaX = 10;
     webMouseWheelEvent.deltaY = 15;
-    webMouseWheelEvent.modifiers = WebInputEvent::ControlKey;
     webMouseWheelEvent.hasPreciseScrollingDeltas = true;
     webMouseWheelEvent.railsMode = WebInputEvent::RailsModeHorizontal;
     webMouseWheelEvent.phase = WebMouseWheelEvent::PhaseBegan;
     webMouseWheelEvent.momentumPhase = WebMouseWheelEvent::PhaseChanged;
 
     PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
     EXPECT_EQ(0, platformWheelBuilder.position().x());
     EXPECT_EQ(5, platformWheelBuilder.position().y());
     EXPECT_EQ(10, platformWheelBuilder.deltaX());
     EXPECT_EQ(15, platformWheelBuilder.deltaY());
     EXPECT_EQ(PlatformEvent::CtrlKey, platformWheelBuilder.getModifiers());
     EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
     EXPECT_EQ(platformWheelBuilder.getRailsMode(),
               PlatformEvent::RailsModeHorizontal);
 #if OS(MACOSX)
     EXPECT_EQ(PlatformWheelEventPhaseBegan, platformWheelBuilder.phase());
     EXPECT_EQ(PlatformWheelEventPhaseChanged,
               platformWheelBuilder.momentumPhase());
 #endif
   }
 
   {
-    WebMouseWheelEvent webMouseWheelEvent;
-    webMouseWheelEvent.type = WebInputEvent::MouseWheel;
+    WebMouseWheelEvent webMouseWheelEvent(WebInputEvent::MouseWheel,
+                                          WebInputEvent::ShiftKey,
+                                          WebInputEvent::TimeStampForTesting);
     webMouseWheelEvent.x = 5;
     webMouseWheelEvent.y = 0;
     webMouseWheelEvent.deltaX = 15;
     webMouseWheelEvent.deltaY = 10;
-    webMouseWheelEvent.modifiers = WebInputEvent::ShiftKey;
     webMouseWheelEvent.hasPreciseScrollingDeltas = false;
     webMouseWheelEvent.railsMode = WebInputEvent::RailsModeFree;
     webMouseWheelEvent.phase = WebMouseWheelEvent::PhaseNone;
     webMouseWheelEvent.momentumPhase = WebMouseWheelEvent::PhaseNone;
 
     PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
     EXPECT_EQ(5, platformWheelBuilder.position().x());
     EXPECT_EQ(0, platformWheelBuilder.position().y());
     EXPECT_EQ(15, platformWheelBuilder.deltaX());
     EXPECT_EQ(10, platformWheelBuilder.deltaY());
     EXPECT_EQ(PlatformEvent::ShiftKey, platformWheelBuilder.getModifiers());
     EXPECT_FALSE(platformWheelBuilder.hasPreciseScrollingDeltas());
     EXPECT_EQ(platformWheelBuilder.getRailsMode(),
               PlatformEvent::RailsModeFree);
 #if OS(MACOSX)
     EXPECT_EQ(PlatformWheelEventPhaseNone, platformWheelBuilder.phase());
     EXPECT_EQ(PlatformWheelEventPhaseNone,
               platformWheelBuilder.momentumPhase());
 #endif
   }
 
   {
-    WebMouseWheelEvent webMouseWheelEvent;
-    webMouseWheelEvent.type = WebInputEvent::MouseWheel;
+    WebMouseWheelEvent webMouseWheelEvent(WebInputEvent::MouseWheel,
+                                          WebInputEvent::AltKey,
+                                          WebInputEvent::TimeStampForTesting);
     webMouseWheelEvent.x = 5;
     webMouseWheelEvent.y = 0;
     webMouseWheelEvent.deltaX = 15;
     webMouseWheelEvent.deltaY = 10;
-    webMouseWheelEvent.modifiers = WebInputEvent::AltKey;
     webMouseWheelEvent.hasPreciseScrollingDeltas = true;
     webMouseWheelEvent.railsMode = WebInputEvent::RailsModeVertical;
     webMouseWheelEvent.phase = WebMouseWheelEvent::PhaseNone;
     webMouseWheelEvent.momentumPhase = WebMouseWheelEvent::PhaseNone;
 
     PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
     EXPECT_EQ(5, platformWheelBuilder.position().x());
     EXPECT_EQ(0, platformWheelBuilder.position().y());
     EXPECT_EQ(15, platformWheelBuilder.deltaX());
     EXPECT_EQ(10, platformWheelBuilder.deltaY());
@@ skipping 20 matching lines @@
   WebViewImpl* webViewImpl =
       webViewHelper.initializeAndLoad(baseURL + fileName, true);
   int pageWidth = 640;
   int pageHeight = 480;
   webViewImpl->resize(WebSize(pageWidth, pageHeight));
   webViewImpl->updateAllLifecyclePhases();
 
   FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureScrollBegin;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollBegin,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.x = 0;
     webGestureEvent.y = 5;
     webGestureEvent.globalX = 10;
     webGestureEvent.globalY = 15;
     webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
     webGestureEvent.resendingPluginId = 2;
     webGestureEvent.data.scrollBegin.inertialPhase =
         WebGestureEvent::MomentumPhase;
     webGestureEvent.data.scrollBegin.synthetic = true;
     webGestureEvent.data.scrollBegin.deltaXHint = 100;
@@ skipping 12 matching lines @@
               platformGestureBuilder.inertialPhase());
     EXPECT_TRUE(platformGestureBuilder.synthetic());
     EXPECT_EQ(100, platformGestureBuilder.deltaX());
     EXPECT_EQ(10, platformGestureBuilder.deltaY());
     EXPECT_EQ(ScrollGranularity::ScrollByPixel,
               platformGestureBuilder.deltaUnits());
     EXPECT_EQ(12345U, platformGestureBuilder.uniqueTouchEventId());
   }
 
   {
-    WebGestureEvent webGestureEvent;
-    webGestureEvent.type = WebInputEvent::GestureScrollEnd;
+    WebGestureEvent webGestureEvent(WebInputEvent::GestureScrollEnd,
+                                    WebInputEvent::NoModifiers,
+                                    WebInputEvent::TimeStampForTesting);
     webGestureEvent.x = 0;
     webGestureEvent.y = 5;
     webGestureEvent.globalX = 10;
     webGestureEvent.globalY = 15;
     webGestureEvent.sourceDevice = WebGestureDeviceTouchpad;
     webGestureEvent.resendingPluginId = 2;
     webGestureEvent.data.scrollEnd.inertialPhase =
         WebGestureEvent::NonMomentumPhase;
     webGestureEvent.data.scrollEnd.synthetic = true;
     webGestureEvent.data.scrollEnd.deltaUnits = WebGestureEvent::Page;
     webGestureEvent.uniqueTouchEventId = 12345U;
 
     PlatformGestureEventBuilder platformGestureBuilder(view, webGestureEvent);
     EXPECT_EQ(PlatformGestureSourceTouchpad, platformGestureBuilder.source());
     EXPECT_EQ(2, platformGestureBuilder.resendingPluginId());
     EXPECT_EQ(0, platformGestureBuilder.position().x());
     EXPECT_EQ(5, platformGestureBuilder.position().y());
     EXPECT_EQ(10, platformGestureBuilder.globalPosition().x());
     EXPECT_EQ(15, platformGestureBuilder.globalPosition().y());
     EXPECT_EQ(ScrollInertialPhaseNonMomentum,
               platformGestureBuilder.inertialPhase());
     EXPECT_TRUE(platformGestureBuilder.synthetic());
     EXPECT_EQ(ScrollGranularity::ScrollByPage,
               platformGestureBuilder.deltaUnits());
     EXPECT_EQ(12345U, platformGestureBuilder.uniqueTouchEventId());
   }
 }
 
 }  // namespace blink