Collapse the API surface on WebInputEvent via accessor functions.

content/browser/renderer_host/render_widget_host_view_android.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/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 1571 matching lines @@
   if (overscroll_controller_)
     overscroll_controller_->OnGestureEventAck(event, ack_result);
 
   if (content_view_core_)
     content_view_core_->OnGestureEventAck(event, ack_result);
 }
 
 InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent(
     const blink::WebInputEvent& input_event) {
   if (selection_controller_ &&
-      blink::WebInputEvent::isGestureEventType(input_event.type)) {
+      blink::WebInputEvent::isGestureEventType(input_event.type())) {
     const blink::WebGestureEvent& gesture_event =
         static_cast<const blink::WebGestureEvent&>(input_event);
-    switch (gesture_event.type) {
+    switch (gesture_event.type()) {
       case blink::WebInputEvent::GestureLongPress:
         if (selection_controller_->WillHandleLongPressEvent(
-                base::TimeTicks() +
-                    base::TimeDelta::FromSecondsD(input_event.timeStampSeconds),
+                base::TimeTicks() + base::TimeDelta::FromSecondsD(
+                                        input_event.timeStampSeconds()),
                 gfx::PointF(gesture_event.x, gesture_event.y))) {
           return INPUT_EVENT_ACK_STATE_CONSUMED;
         }
         break;
 
       case blink::WebInputEvent::GestureTap:
         if (selection_controller_->WillHandleTapEvent(
                 gfx::PointF(gesture_event.x, gesture_event.y),
                 gesture_event.data.tap.tapCount)) {
           return INPUT_EVENT_ACK_STATE_CONSUMED;
         }
         break;
 
       case blink::WebInputEvent::GestureScrollBegin:
         selection_controller_->OnScrollBeginEvent();
         break;
 
       default:
         break;
     }
   }
 
   if (overscroll_controller_ &&
-      blink::WebInputEvent::isGestureEventType(input_event.type) &&
+      blink::WebInputEvent::isGestureEventType(input_event.type()) &&
       overscroll_controller_->WillHandleGestureEvent(
           static_cast<const blink::WebGestureEvent&>(input_event))) {
     return INPUT_EVENT_ACK_STATE_CONSUMED;
   }
 
   if (content_view_core_ && content_view_core_->FilterInputEvent(input_event))
     return INPUT_EVENT_ACK_STATE_CONSUMED;
 
   if (!host_)
     return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 
-  if (input_event.type == blink::WebInputEvent::GestureTapDown ||
-      input_event.type == blink::WebInputEvent::TouchStart) {
+  if (input_event.type() == blink::WebInputEvent::GestureTapDown ||
+      input_event.type() == blink::WebInputEvent::TouchStart) {
     GpuDataManagerImpl* gpu_data = GpuDataManagerImpl::GetInstance();
     GpuProcessHostUIShim* shim = GpuProcessHostUIShim::GetOneInstance();
     if (shim && gpu_data &&
         gpu_data->IsDriverBugWorkaroundActive(gpu::WAKE_UP_GPU_BEFORE_DRAWING))
       shim->Send(new GpuMsg_WakeUpGpu);
   }
 
   return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 }
 
@@ skipping 202 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::OnGestureEvent(
     const ui::GestureEventData& gesture) {
   blink::WebGestureEvent web_gesture =
       ui::CreateWebGestureEventFromGestureEventData(gesture);
   // TODO(jdduke): Remove this workaround after Android fixes UiAutomator to
   // stop providing shift meta values to synthetic MotionEvents. This prevents
   // unintended shift+click interpretation of all accessibility clicks.
   // See crbug.com/443247.
-  if (web_gesture.type == blink::WebInputEvent::GestureTap &&
-      web_gesture.modifiers == blink::WebInputEvent::ShiftKey) {
-    web_gesture.modifiers = 0;
+  if (web_gesture.type() == blink::WebInputEvent::GestureTap &&
+      web_gesture.modifiers() == blink::WebInputEvent::ShiftKey) {
+    web_gesture.setModifiers(blink::WebInputEvent::NoModifiers);
   }
   SendGestureEvent(web_gesture);
 }
 
 void RenderWidgetHostViewAndroid::OnContentViewCoreDestroyed() {
   SetContentViewCore(NULL);
   overscroll_controller_.reset();
 }
 
 void RenderWidgetHostViewAndroid::OnCompositingDidCommit() {
@@ skipping 204 matching lines @@
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor,
       ui::GetScaleFactorForNativeView(GetNativeView()));
   is_showing_overscroll_glow_ = true;
 }
 
 }  // namespace content