Collapse the API surface on WebInputEvent via accessor functions.

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index f68fc6ef93ed255ce26b05c5a17c8ab866c3828b..5e57094a1ac9f7a891f91b77b7cf643fce0768ed 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -160,11 +160,11 @@ class RenderWidgetHostIteratorImpl : public RenderWidgetHostIterator {
 
 inline blink::WebGestureEvent CreateScrollBeginForWrapping(
     const blink::WebGestureEvent& gesture_event) {
-  DCHECK(gesture_event.type == blink::WebInputEvent::GestureScrollUpdate);
+  DCHECK(gesture_event.type() == blink::WebInputEvent::GestureScrollUpdate);
 
   blink::WebGestureEvent wrap_gesture_scroll_begin(
-      blink::WebInputEvent::GestureScrollBegin, gesture_event.modifiers,
-      gesture_event.timeStampSeconds);
+      blink::WebInputEvent::GestureScrollBegin, gesture_event.modifiers(),
+      gesture_event.timeStampSeconds());
   wrap_gesture_scroll_begin.sourceDevice = gesture_event.sourceDevice;
   wrap_gesture_scroll_begin.data.scrollBegin.deltaXHint = 0;
   wrap_gesture_scroll_begin.data.scrollBegin.deltaYHint = 0;
@@ -177,11 +177,11 @@ inline blink::WebGestureEvent CreateScrollBeginForWrapping(
 
 inline blink::WebGestureEvent CreateScrollEndForWrapping(
     const blink::WebGestureEvent& gesture_event) {
-  DCHECK(gesture_event.type == blink::WebInputEvent::GestureScrollUpdate);
+  DCHECK(gesture_event.type() == blink::WebInputEvent::GestureScrollUpdate);
 
   blink::WebGestureEvent wrap_gesture_scroll_end(
-      blink::WebInputEvent::GestureScrollEnd, gesture_event.modifiers,
-      gesture_event.timeStampSeconds);
+      blink::WebInputEvent::GestureScrollEnd, gesture_event.modifiers(),
+      gesture_event.timeStampSeconds());
   wrap_gesture_scroll_end.sourceDevice = gesture_event.sourceDevice;
   wrap_gesture_scroll_end.resendingPluginId = gesture_event.resendingPluginId;
   wrap_gesture_scroll_end.data.scrollEnd.deltaUnits =
@@ -1106,20 +1106,20 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
               blink::WebGestureDevice::WebGestureDeviceTouchpad
           ? &is_in_touchpad_gesture_scroll_
           : &is_in_touchscreen_gesture_scroll_;
-  if (gesture_event.type == blink::WebInputEvent::GestureScrollBegin) {
+  if (gesture_event.type() == blink::WebInputEvent::GestureScrollBegin) {
     DCHECK(!(*is_in_gesture_scroll));
     *is_in_gesture_scroll = true;
-  } else if (gesture_event.type == blink::WebInputEvent::GestureScrollEnd ||
-             gesture_event.type == blink::WebInputEvent::GestureFlingStart) {
+  } else if (gesture_event.type() == blink::WebInputEvent::GestureScrollEnd ||
+             gesture_event.type() == blink::WebInputEvent::GestureFlingStart) {
     DCHECK(*is_in_gesture_scroll ||
-           (gesture_event.type == blink::WebInputEvent::GestureFlingStart &&
+           (gesture_event.type() == blink::WebInputEvent::GestureFlingStart &&
             gesture_event.sourceDevice ==
                 blink::WebGestureDevice::WebGestureDeviceTouchpad));
     *is_in_gesture_scroll = false;
   }
 
   bool scroll_update_needs_wrapping =
-      gesture_event.type == blink::WebInputEvent::GestureScrollUpdate &&
+      gesture_event.type() == blink::WebInputEvent::GestureScrollUpdate &&
       gesture_event.resendingPluginId != -1 && !(*is_in_gesture_scroll);
 
   // TODO(crbug.com/544782): Fix WebViewGuestScrollTest.TestGuestWheelScrolls-
@@ -1198,25 +1198,25 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
   if (KeyPressListenersHandleEvent(key_event)) {
     // Some keypresses that are accepted by the listener may be followed by Char
     // and KeyUp events, which should be ignored.
-    if (key_event.type == WebKeyboardEvent::RawKeyDown)
+    if (key_event.type() == WebKeyboardEvent::RawKeyDown)
       suppress_events_until_keydown_ = true;
     return;
   }
 
   // Double check the type to make sure caller hasn't sent us nonsense that
   // will mess up our key queue.
-  if (!WebInputEvent::isKeyboardEventType(key_event.type))
+  if (!WebInputEvent::isKeyboardEventType(key_event.type()))
     return;
 
   if (suppress_events_until_keydown_) {
     // If the preceding RawKeyDown event was handled by the browser, then we
     // need to suppress all events generated by it until the next RawKeyDown or
     // KeyDown event.
-    if (key_event.type == WebKeyboardEvent::KeyUp ||
-        key_event.type == WebKeyboardEvent::Char)
+    if (key_event.type() == WebKeyboardEvent::KeyUp ||
+        key_event.type() == WebKeyboardEvent::Char)
       return;
-    DCHECK(key_event.type == WebKeyboardEvent::RawKeyDown ||
-           key_event.type == WebKeyboardEvent::KeyDown);
+    DCHECK(key_event.type() == WebKeyboardEvent::RawKeyDown ||
+           key_event.type() == WebKeyboardEvent::KeyDown);
     suppress_events_until_keydown_ = false;
   }
 
@@ -1228,7 +1228,7 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
     // PreHandleKeyboardEvent() returns true, but |this| may already be
     // destroyed at that time. So set |suppress_events_until_keydown_| true
     // here, then revert it afterwards when necessary.
-    if (key_event.type == WebKeyboardEvent::RawKeyDown)
+    if (key_event.type() == WebKeyboardEvent::RawKeyDown)
       suppress_events_until_keydown_ = true;
 
     // Tab switching/closing accelerators aren't sent to the renderer to avoid
@@ -1236,7 +1236,7 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
     if (delegate_->PreHandleKeyboardEvent(key_event, &is_shortcut))
       return;
 
-    if (key_event.type == WebKeyboardEvent::RawKeyDown)
+    if (key_event.type() == WebKeyboardEvent::RawKeyDown)
       suppress_events_until_keydown_ = false;
   }
 
@@ -2065,7 +2065,7 @@ void RenderWidgetHostImpl::SetIgnoreInputEvents(bool ignore_input_events) {
 
 bool RenderWidgetHostImpl::KeyPressListenersHandleEvent(
     const NativeWebKeyboardEvent& event) {
-  if (event.skip_in_browser || event.type != WebKeyboardEvent::RawKeyDown)
+  if (event.skip_in_browser || event.type() != WebKeyboardEvent::RawKeyDown)
     return false;
 
   for (size_t i = 0; i < key_press_event_callbacks_.size(); i++) {
@@ -2090,22 +2090,22 @@ InputEventAckState RenderWidgetHostImpl::FilterInputEvent(
   // Don't ignore touch cancel events, since they may be sent while input
   // events are being ignored in order to keep the renderer from getting
   // confused about how many touches are active.
-  if (ShouldDropInputEvents() && event.type != WebInputEvent::TouchCancel)
+  if (ShouldDropInputEvents() && event.type() != WebInputEvent::TouchCancel)
     return INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
 
   if (!process_->HasConnection())
     return INPUT_EVENT_ACK_STATE_UNKNOWN;
 
   if (delegate_) {
-    if (event.type == WebInputEvent::MouseDown ||
-        event.type == WebInputEvent::TouchStart) {
+    if (event.type() == WebInputEvent::MouseDown ||
+        event.type() == WebInputEvent::TouchStart) {
       delegate_->FocusOwningWebContents(this);
     }
-    if (event.type == WebInputEvent::MouseDown ||
-        event.type == WebInputEvent::GestureScrollBegin ||
-        event.type == WebInputEvent::TouchStart ||
-        event.type == WebInputEvent::RawKeyDown) {
-      delegate_->OnUserInteraction(this, event.type);
+    if (event.type() == WebInputEvent::MouseDown ||
+        event.type() == WebInputEvent::GestureScrollBegin ||
+        event.type() == WebInputEvent::TouchStart ||
+        event.type() == WebInputEvent::RawKeyDown) {
+      delegate_->OnUserInteraction(this, event.type());
     }
   }