Collapse the API surface on WebInputEvent via accessor functions.

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"
@@ skipping 71 matching lines @@
 
   // 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(
         WebInputEvent::GestureScrollUpdate, WebInputEvent::NoModifiers,
-        event_sent_for_gesture_ack_->event.timeStampSeconds);
+        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.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 &
+    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 =
           event_sent_for_gesture_ack_->event.deltaX;
     } else {
       scroll_update.data.scrollUpdate.deltaX =
           event_sent_for_gesture_ack_->event.deltaX;
       scroll_update.data.scrollUpdate.deltaY =
@@ skipping 101 matching lines @@
       }
     }
   }
 
   event_sent_for_gesture_ack_.reset();
   TryForwardNextEventToRenderer();
 }
 
 void MouseWheelEventQueue::OnGestureScrollEvent(
     const GestureEventWithLatencyInfo& gesture_event) {
-  if (gesture_event.event.type == blink::WebInputEvent::GestureScrollBegin) {
+  if (gesture_event.event.type() == blink::WebInputEvent::GestureScrollBegin) {
     // If there is a current scroll going on and a new scroll that isn't
     // wheel based cancel current one by sending a ScrollEnd.
     if (scroll_end_timer_.IsRunning() &&
         gesture_event.event.sourceDevice != blink::WebGestureDeviceTouchpad) {
       base::Closure task = scroll_end_timer_.user_task();
       scroll_end_timer_.Reset();
       task.Run();
     }
     scrolling_device_ = gesture_event.event.sourceDevice;
   } else if (scrolling_device_ == gesture_event.event.sourceDevice &&
-             (gesture_event.event.type ==
+             (gesture_event.event.type() ==
                   blink::WebInputEvent::GestureScrollEnd ||
-              gesture_event.event.type ==
+              gesture_event.event.type() ==
                   blink::WebInputEvent::GestureFlingStart)) {
     scrolling_device_ = blink::WebGestureDeviceUninitialized;
     if (scroll_end_timer_.IsRunning())
       scroll_end_timer_.Reset();
   }
 }
 
 void MouseWheelEventQueue::TryForwardNextEventToRenderer() {
   TRACE_EVENT0("input", "MouseWheelEventQueue::TryForwardNextEventToRenderer");
 
@@ skipping 50 matching lines @@
   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