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

content/browser/renderer_host/input/input_router_impl_perftest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "content/browser/renderer_host/input/input_ack_handler.h"
 #include "content/browser/renderer_host/input/input_router_client.h"
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_sender.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/blink/web_input_event_traits.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 using base::TimeDelta;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace content {
@@ skipping 88 matching lines @@
   size_t sent_count_;
 };
 
 typedef std::vector<WebGestureEvent> Gestures;
 Gestures BuildScrollSequence(size_t steps,
                              const gfx::Vector2dF& origin,
                              const gfx::Vector2dF& distance) {
   Gestures gestures;
   const gfx::Vector2dF delta = ScaleVector2d(distance, 1.f / steps);
 
-  WebGestureEvent gesture;
-  gesture.type = WebInputEvent::GestureScrollBegin;
+  WebGestureEvent gesture(WebInputEvent::GestureScrollBegin,
+                          WebInputEvent::NoModifiers,
+                          ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
   gesture.x = origin.x();
   gesture.y = origin.y();
   gestures.push_back(gesture);
 
-  gesture.type = WebInputEvent::GestureScrollUpdate;
+  gesture.setType(WebInputEvent::GestureScrollUpdate);
   gesture.data.scrollUpdate.deltaX = delta.x();
   gesture.data.scrollUpdate.deltaY = delta.y();
   for (size_t i = 0; i < steps; ++i) {
     gesture.x += delta.x();
     gesture.y += delta.y();
     gestures.push_back(gesture);
   }
 
-  gesture.type = WebInputEvent::GestureScrollEnd;
+  gesture.setType(WebInputEvent::GestureScrollEnd);
   gestures.push_back(gesture);
   return gestures;
 }
 
 typedef std::vector<WebTouchEvent> Touches;
 Touches BuildTouchSequence(size_t steps,
                            const gfx::Vector2dF& origin,
                            const gfx::Vector2dF& distance) {
   Touches touches;
   const gfx::Vector2dF delta = ScaleVector2d(distance, 1.f / steps);
 
-  WebTouchEvent touch;
+  WebTouchEvent touch(WebInputEvent::TouchStart, WebInputEvent::NoModifiers,
+                      ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
   touch.touchesLength = 1;
-  touch.type = WebInputEvent::TouchStart;
   touch.touches[0].id = 0;
   touch.touches[0].state = WebTouchPoint::StatePressed;
   touch.touches[0].position.x = origin.x();
   touch.touches[0].position.y = origin.y();
   touch.touches[0].screenPosition.x = origin.x();
   touch.touches[0].screenPosition.y = origin.y();
   touches.push_back(touch);
 
-  touch.type = WebInputEvent::TouchMove;
+  touch.setType(WebInputEvent::TouchMove);
   touch.touches[0].state = WebTouchPoint::StateMoved;
   for (size_t i = 0; i < steps; ++i) {
     touch.touches[0].position.x += delta.x();
     touch.touches[0].position.y += delta.y();
     touch.touches[0].screenPosition.x += delta.x();
     touch.touches[0].screenPosition.y += delta.y();
     touches.push_back(touch);
   }
 
-  touch.type = WebInputEvent::TouchEnd;
+  touch.setType(WebInputEvent::TouchEnd);
   touch.touches[0].state = WebTouchPoint::StateReleased;
   touches.push_back(touch);
   return touches;
 }
 
 class InputEventTimer {
  public:
   InputEventTimer(const char* test_name, int64_t event_count)
       : test_name_(test_name),
         event_count_(event_count),
@@ skipping 199 matching lines @@
 
 TEST_F(InputRouterImplPerfTest, TouchSwipeToGestureScroll) {
   SimulateTouchAndScrollEventSequence("TouchSwipeToGestureScroll ",
                                       kDefaultSteps,
                                       kDefaultOrigin,
                                       kDefaultDistance,
                                       kDefaultIterations);
 }
 
 }  // namespace content