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

content/browser/renderer_host/input/mouse_wheel_event_queue.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 "content/browser/renderer_host/input/mouse_wheel_event_queue.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/blink/web_input_event_traits.h"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebMouseWheelEvent;
 using ui::LatencyInfo;
 
 namespace content {
 
 // This class represents a single queued mouse wheel event. Its main use
@@ skipping 59 matching lines @@
   event_sent_for_gesture_ack_->latency.AddNewLatencyFrom(latency_info);
   client_->OnMouseWheelEventAck(*event_sent_for_gesture_ack_, ack_result);
 
   // If event wasn't consumed then generate a gesture scroll for it.
   if (ack_result != INPUT_EVENT_ACK_STATE_CONSUMED &&
       ui::WebInputEventTraits::CanCauseScroll(
           event_sent_for_gesture_ack_->event) &&
       event_sent_for_gesture_ack_->event.resendingPluginId == -1 &&
       (scrolling_device_ == blink::WebGestureDeviceUninitialized ||
        scrolling_device_ == blink::WebGestureDeviceTouchpad)) {
-    WebGestureEvent scroll_update;
-    scroll_update.timeStampSeconds =
-        event_sent_for_gesture_ack_->event.timeStampSeconds;
+    WebGestureEvent scroll_update(
+        WebInputEvent::GestureScrollUpdate, WebInputEvent::NoModifiers,
+        event_sent_for_gesture_ack_->event.timeStampSeconds);
 
     scroll_update.x = event_sent_for_gesture_ack_->event.x;
     scroll_update.y = event_sent_for_gesture_ack_->event.y;
     scroll_update.globalX = event_sent_for_gesture_ack_->event.globalX;
     scroll_update.globalY = event_sent_for_gesture_ack_->event.globalY;
-    scroll_update.type = WebInputEvent::GestureScrollUpdate;
     scroll_update.sourceDevice = blink::WebGestureDeviceTouchpad;
     scroll_update.resendingPluginId = -1;
 
     // Swap X & Y if Shift is down and when there is no horizontal movement.
     if ((event_sent_for_gesture_ack_->event.modifiers &
          WebInputEvent::ShiftKey) != 0 &&
         event_sent_for_gesture_ack_->event.deltaX == 0) {
       scroll_update.data.scrollUpdate.deltaX =
           event_sent_for_gesture_ack_->event.deltaY;
       scroll_update.data.scrollUpdate.deltaY =
@@ skipping 185 matching lines @@
   wheel_queue_.pop_front();
 
   client_->SendMouseWheelEventImmediately(*event_sent_for_gesture_ack_);
 }
 
 void MouseWheelEventQueue::SendScrollEnd(WebGestureEvent update_event,
                                          bool synthetic) {
   DCHECK((synthetic && !needs_scroll_end_) || needs_scroll_end_);
 
   WebGestureEvent scroll_end(update_event);
-  scroll_end.timeStampSeconds =
-      (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
-  scroll_end.type = WebInputEvent::GestureScrollEnd;
+  scroll_end.setTimeStampSeconds(
+      ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
+  scroll_end.setType(WebInputEvent::GestureScrollEnd);
   scroll_end.resendingPluginId = -1;
   scroll_end.data.scrollEnd.synthetic = synthetic;
   scroll_end.data.scrollEnd.inertialPhase =
       update_event.data.scrollUpdate.inertialPhase;
   scroll_end.data.scrollEnd.deltaUnits =
       update_event.data.scrollUpdate.deltaUnits;
 
   if (!synthetic) {
     needs_scroll_begin_ = true;
     needs_scroll_end_ = false;
 
     if (scroll_end_timer_.IsRunning())
       scroll_end_timer_.Reset();
   }
   client_->ForwardGestureEventWithLatencyInfo(
       scroll_end, ui::LatencyInfo(ui::SourceEventType::WHEEL));
 }
 
 void MouseWheelEventQueue::SendScrollBegin(
     const WebGestureEvent& gesture_update,
     bool synthetic) {
   DCHECK((synthetic && !needs_scroll_begin_) || needs_scroll_begin_);
 
   WebGestureEvent scroll_begin(gesture_update);
-  scroll_begin.type = WebInputEvent::GestureScrollBegin;
+  scroll_begin.setType(WebInputEvent::GestureScrollBegin);
   scroll_begin.data.scrollBegin.synthetic = synthetic;
   scroll_begin.data.scrollBegin.inertialPhase =
       gesture_update.data.scrollUpdate.inertialPhase;
   scroll_begin.data.scrollBegin.deltaXHint =
       gesture_update.data.scrollUpdate.deltaX;
   scroll_begin.data.scrollBegin.deltaYHint =
       gesture_update.data.scrollUpdate.deltaY;
   scroll_begin.data.scrollBegin.targetViewport = false;
   scroll_begin.data.scrollBegin.deltaHintUnits =
       gesture_update.data.scrollUpdate.deltaUnits;
 
   needs_scroll_begin_ = false;
   needs_scroll_end_ = true;
   client_->ForwardGestureEventWithLatencyInfo(
       scroll_begin, ui::LatencyInfo(ui::SourceEventType::WHEEL));
 }
 
 }  // namespace content