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

content/renderer/render_widget_fullscreen_pepper.cc

 // Copyright (c) 2012 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/renderer/render_widget_fullscreen_pepper.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 47 matching lines @@
   // MouseLockDispatcher implementation.
   void SendLockMouseRequest(bool unlocked_by_target) override;
   void SendUnlockMouseRequest() override;
 
   RenderWidgetFullscreenPepper* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenMouseLockDispatcher);
 };
 
 WebMouseEvent WebMouseEventFromGestureEvent(const WebGestureEvent& gesture) {
-  WebMouseEvent mouse;
 
   // Only convert touch screen gesture events, do not convert
   // touchpad/mouse wheel gesture events. (crbug.com/620974)
   if (gesture.sourceDevice != blink::WebGestureDeviceTouchscreen)
-    return mouse;
+    return WebMouseEvent();
 
+  WebInputEvent::Type type = WebInputEvent::Undefined;
   switch (gesture.type) {
     case WebInputEvent::GestureScrollBegin:
-      mouse.type = WebInputEvent::MouseDown;
+      type = WebInputEvent::MouseDown;
       break;
     case WebInputEvent::GestureScrollUpdate:
-      mouse.type = WebInputEvent::MouseMove;
+      type = WebInputEvent::MouseMove;
       break;
     case WebInputEvent::GestureFlingStart:
       // A scroll gesture on the touchscreen may end with a GestureScrollEnd
       // when there is no velocity, or a GestureFlingStart when it has a
       // velocity. In both cases, it should end the drag that was initiated by
       // the GestureScrollBegin (and subsequent GestureScrollUpdate) events.
-      mouse.type = WebInputEvent::MouseUp;
+      type = WebInputEvent::MouseUp;
+      break;
     case WebInputEvent::GestureScrollEnd:
-      mouse.type = WebInputEvent::MouseUp;
+      type = WebInputEvent::MouseUp;
       break;
     default:
-      return mouse;
+      return WebMouseEvent();
   }
 
-  mouse.timeStampSeconds = gesture.timeStampSeconds;
-  mouse.modifiers = gesture.modifiers | WebInputEvent::LeftButtonDown;
+  WebMouseEvent mouse(type, gesture.modifiers | WebInputEvent::LeftButtonDown,
+                      gesture.timeStampSeconds);
   mouse.button = WebMouseEvent::Button::Left;
   mouse.clickCount = (mouse.type == WebInputEvent::MouseDown ||
                       mouse.type == WebInputEvent::MouseUp);
 
   mouse.x = gesture.x;
   mouse.y = gesture.y;
   mouse.windowX = gesture.x;
   mouse.windowY = gesture.y;
   mouse.globalX = gesture.globalX;
   mouse.globalY = gesture.globalY;
@@ skipping 56 matching lines @@
 
     // Pepper plugins do not accept gesture events. So do not send the gesture
     // events directly to the plugin. Instead, try to convert them to equivalent
     // mouse events, and then send to the plugin.
     if (WebInputEvent::isGestureEventType(event.type)) {
       bool result = false;
       const WebGestureEvent* gesture_event =
           static_cast<const WebGestureEvent*>(&event);
       switch (event.type) {
         case WebInputEvent::GestureTap: {
-          WebMouseEvent mouse;
-
-          mouse.timeStampSeconds = gesture_event->timeStampSeconds;
-          mouse.type = WebInputEvent::MouseMove;
-          mouse.modifiers = gesture_event->modifiers;
-
+          WebMouseEvent mouse(WebInputEvent::MouseMove,
+                              gesture_event->modifiers,
+                              gesture_event->timeStampSeconds);
           mouse.x = gesture_event->x;
           mouse.y = gesture_event->y;
           mouse.windowX = gesture_event->x;
           mouse.windowY = gesture_event->y;
           mouse.globalX = gesture_event->globalX;
           mouse.globalY = gesture_event->globalY;
           mouse.movementX = 0;
           mouse.movementY = 0;
           result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
 
-          mouse.type = WebInputEvent::MouseDown;
+          mouse.setType(WebInputEvent::MouseDown);
           mouse.button = WebMouseEvent::Button::Left;
           mouse.clickCount = gesture_event->data.tap.tapCount;
           result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
 
-          mouse.type = WebInputEvent::MouseUp;
+          mouse.setType(WebInputEvent::MouseUp);
           result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
           break;
         }
 
         default: {
           WebMouseEvent mouse = WebMouseEventFromGestureEvent(*gesture_event);
           if (mouse.type != WebInputEvent::Undefined)
             result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
           break;
         }
@@ skipping 173 matching lines @@
 GURL RenderWidgetFullscreenPepper::GetURLForGraphicsContext3D() {
   return active_url_;
 }
 
 void RenderWidgetFullscreenPepper::OnDeviceScaleFactorChanged() {
   if (compositor_)
     compositor_->setDeviceScaleFactor(device_scale_factor_);
 }
 
 }  // namespace content