Collapse the API surface on WebInputEvent via accessor functions.

chrome/browser/android/vr_shell/vr_shell_gl.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 "chrome/browser/android/vr_shell/vr_shell_gl.h"
 
 #include "base/android/jni_android.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 103 matching lines @@
     quat.qz = 0.0f;
     vr_shell::NormalizeQuat(quat);
   }
   return quat;
 }
 
 std::unique_ptr<blink::WebMouseEvent> MakeMouseEvent(WebInputEvent::Type type,
                                                      double timestamp,
                                                      float x,
                                                      float y) {
-  std::unique_ptr<blink::WebMouseEvent> mouse_event(new blink::WebMouseEvent);
-  mouse_event->type = type;
+  std::unique_ptr<blink::WebMouseEvent> mouse_event(new blink::WebMouseEvent(
+      type, blink::WebInputEvent::NoModifiers, timestamp));
   mouse_event->pointerType = blink::WebPointerProperties::PointerType::Mouse;
   mouse_event->x = x;
   mouse_event->y = y;
   mouse_event->windowX = x;
   mouse_event->windowY = y;
-  mouse_event->timeStampSeconds = timestamp;
   mouse_event->clickCount = 1;
-  mouse_event->modifiers = 0;
 
   return mouse_event;
 }
 
 enum class ViewerType {
   UNKNOWN_TYPE = 0,
   CARDBOARD = 1,
   DAYDREAM = 2,
   VIEWER_TYPE_MAX,
 };
@@ skipping 266 matching lines @@
     main_thread_task_runner_->PostTask(
         FROM_HERE, base::Bind(&VrShell::AppButtonPressed, weak_vr_shell_));
   }
 
   if (web_vr_mode_) {
     // Process screen touch events for Cardboard button compatibility.
     // Also send tap events for controller "touchpad click" events.
     if (touch_pending_ || controller_->ButtonUpHappened(
             gvr::ControllerButton::GVR_CONTROLLER_BUTTON_CLICK)) {
       touch_pending_ = false;
-      std::unique_ptr<WebGestureEvent> gesture(new WebGestureEvent());
+      std::unique_ptr<WebGestureEvent> gesture(new WebGestureEvent(
+          WebInputEvent::GestureTapDown, WebInputEvent::NoModifiers,
+          (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF()));
       gesture->sourceDevice = blink::WebGestureDeviceTouchpad;
-      gesture->timeStampSeconds =
-          (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
-      gesture->type = WebInputEvent::GestureTapDown;
       gesture->x = 0;
       gesture->y = 0;
       SendGesture(InputTarget::CONTENT, std::move(gesture));
     }
 
     return;
   }
 
   gvr::Vec3f ergo_neutral_pose;
   if (!controller_->IsConnected()) {
@@ skipping 86 matching lines @@
     }
   }
   SendEventsToTarget(input_target, pixel_x, pixel_y);
 }
 
 void VrShellGl::SendEventsToTarget(InputTarget input_target,
                                    int pixel_x,
                                    int pixel_y) {
   std::vector<std::unique_ptr<WebGestureEvent>> gesture_list =
       controller_->DetectGestures();
-  double timestamp = gesture_list.front()->timeStampSeconds;
+  double timestamp = gesture_list.front()->timeStampSeconds();
 
   if (touch_pending_) {
     touch_pending_ = false;
-    std::unique_ptr<WebGestureEvent> event(new WebGestureEvent());
-    event->type = WebInputEvent::GestureTapDown;
+    std::unique_ptr<WebGestureEvent> event(new WebGestureEvent(
+        WebInputEvent::GestureTapDown, WebInputEvent::NoModifiers, timestamp));
     event->sourceDevice = blink::WebGestureDeviceTouchpad;
-    event->timeStampSeconds = timestamp;
     event->x = pixel_x;
     event->y = pixel_y;
     gesture_list.push_back(std::move(event));
   }
 
   for (const auto& gesture : gesture_list) {
-    switch (gesture->type) {
+    switch (gesture->type()) {
       case WebInputEvent::GestureScrollBegin:
       case WebInputEvent::GestureScrollUpdate:
       case WebInputEvent::GestureScrollEnd:
       case WebInputEvent::GestureFlingCancel:
       case WebInputEvent::GestureFlingStart:
         SendGesture(InputTarget::CONTENT,
                     base::WrapUnique(new WebGestureEvent(*gesture)));
         break;
       case WebInputEvent::GestureTapDown:
         gesture->x = pixel_x;
@@ skipping 440 matching lines @@
 void VrShellGl::ForceExitVr() {
   main_thread_task_runner_->PostTask(
       FROM_HERE, base::Bind(&VrShell::ForceExitVr, weak_vr_shell_));
 }
 
 void VrShellGl::UpdateScene(std::unique_ptr<base::ListValue> commands) {
   scene_->HandleCommands(std::move(commands), TimeInMicroseconds());
 }
 
 }  // namespace vr_shell