Collapse the API surface on WebInputEvent via accessor functions.

content/browser/renderer_host/overscroll_controller.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/overscroll_controller.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/renderer_host/overscroll_controller_delegate.h"
 #include "content/public/browser/overscroll_configuration.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
 
 using blink::WebInputEvent;
 
 namespace {
 
 bool IsScrollEndEffectEnabled() {
   return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       switches::kScrollEndEffect) == "1";
 }
 
 bool IsGestureEventFromTouchpad(const blink::WebInputEvent& event) {
-  DCHECK(blink::WebInputEvent::isGestureEventType(event.type));
+  DCHECK(blink::WebInputEvent::isGestureEventType(event.type()));
   const blink::WebGestureEvent& gesture =
       static_cast<const blink::WebGestureEvent&>(event);
   return gesture.sourceDevice == blink::WebGestureDeviceTouchpad;
 }
 
 }  // namespace
 
 namespace content {
 
 OverscrollController::OverscrollController()
     : overscroll_mode_(OVERSCROLL_NONE),
       scroll_state_(STATE_UNKNOWN),
       overscroll_delta_x_(0.f),
       overscroll_delta_y_(0.f),
       delegate_(NULL) {}
 
 OverscrollController::~OverscrollController() {
 }
 
 bool OverscrollController::ShouldProcessEvent(
     const blink::WebInputEvent& event) {
-    switch (event.type) {
-      case blink::WebInputEvent::MouseWheel:
-        return false;
-      case blink::WebInputEvent::GestureScrollBegin:
-      case blink::WebInputEvent::GestureScrollUpdate:
-      case blink::WebInputEvent::GestureScrollEnd: {
-        const blink::WebGestureEvent& gesture =
-            static_cast<const blink::WebGestureEvent&>(event);
-        blink::WebGestureEvent::ScrollUnits scrollUnits;
-        switch (event.type) {
-          case blink::WebInputEvent::GestureScrollBegin:
-            scrollUnits = gesture.data.scrollBegin.deltaHintUnits;
-            break;
-          case blink::WebInputEvent::GestureScrollUpdate:
-            scrollUnits = gesture.data.scrollUpdate.deltaUnits;
-            break;
-          case blink::WebInputEvent::GestureScrollEnd:
-            scrollUnits = gesture.data.scrollEnd.deltaUnits;
-            break;
-          default:
-            scrollUnits = blink::WebGestureEvent::Pixels;
-            break;
-        }
+  switch (event.type()) {
+    case blink::WebInputEvent::MouseWheel:
+      return false;
+    case blink::WebInputEvent::GestureScrollBegin:
+    case blink::WebInputEvent::GestureScrollUpdate:
+    case blink::WebInputEvent::GestureScrollEnd: {
+      const blink::WebGestureEvent& gesture =
+          static_cast<const blink::WebGestureEvent&>(event);
+      blink::WebGestureEvent::ScrollUnits scrollUnits;
+      switch (event.type()) {
+        case blink::WebInputEvent::GestureScrollBegin:
+          scrollUnits = gesture.data.scrollBegin.deltaHintUnits;
+          break;
+        case blink::WebInputEvent::GestureScrollUpdate:
+          scrollUnits = gesture.data.scrollUpdate.deltaUnits;
+          break;
+        case blink::WebInputEvent::GestureScrollEnd:
+          scrollUnits = gesture.data.scrollEnd.deltaUnits;
+          break;
+        default:
+          scrollUnits = blink::WebGestureEvent::Pixels;
+          break;
+      }
 
-        return scrollUnits == blink::WebGestureEvent::PrecisePixels;
-      }
-      default:
-        break;
+      return scrollUnits == blink::WebGestureEvent::PrecisePixels;
+    }
+    default:
+      break;
     }

[majidvp, 2017/01/12 21:58:07]

nit: The automated indentation seems to have a bug here.
In particular the } should be aligned with return statement
in line below.

[dtapuska, 2017/01/12 22:09:34]

Done.

   return true;
 }
 
 bool OverscrollController::WillHandleEvent(const blink::WebInputEvent& event) {
   if (!ShouldProcessEvent(event))
     return false;
 
   bool reset_scroll_state = false;
   if (scroll_state_ != STATE_UNKNOWN ||
       overscroll_delta_x_ || overscroll_delta_y_) {
-    switch (event.type) {
+    switch (event.type()) {
       case blink::WebInputEvent::GestureScrollEnd:
         // Avoid resetting the state on GestureScrollEnd generated
         // from the touchpad since it is sent based on a timeout.
         reset_scroll_state = !IsGestureEventFromTouchpad(event);
         break;
 
       case blink::WebInputEvent::GestureFlingStart:
         reset_scroll_state = true;
         break;
 
       case blink::WebInputEvent::MouseWheel: {
         const blink::WebMouseWheelEvent& wheel =
             static_cast<const blink::WebMouseWheelEvent&>(event);
         if (!wheel.hasPreciseScrollingDeltas ||
             wheel.phase == blink::WebMouseWheelEvent::PhaseEnded ||
             wheel.phase == blink::WebMouseWheelEvent::PhaseCancelled) {
           reset_scroll_state = true;
         }
         break;
       }
 
       default:
-        if (blink::WebInputEvent::isMouseEventType(event.type) ||
-            blink::WebInputEvent::isKeyboardEventType(event.type)) {
+        if (blink::WebInputEvent::isMouseEventType(event.type()) ||
+            blink::WebInputEvent::isKeyboardEventType(event.type())) {
           reset_scroll_state = true;
         }
         break;
     }
   }
 
   if (reset_scroll_state)
     scroll_state_ = STATE_UNKNOWN;
 
   if (DispatchEventCompletesAction(event)) {
@@ skipping 25 matching lines @@
 void OverscrollController::ReceivedEventACK(const blink::WebInputEvent& event,
                                             bool processed) {
   if (!ShouldProcessEvent(event))
     return;
 
   if (processed) {
     // If a scroll event is consumed by the page, i.e. some content on the page
     // has been scrolled, then there is not going to be an overscroll gesture,
     // until the current scroll ends, and a new scroll gesture starts.
     if (scroll_state_ == STATE_UNKNOWN &&
-        (event.type == blink::WebInputEvent::MouseWheel ||
-         event.type == blink::WebInputEvent::GestureScrollUpdate)) {
+        (event.type() == blink::WebInputEvent::MouseWheel ||
+         event.type() == blink::WebInputEvent::GestureScrollUpdate)) {
       scroll_state_ = STATE_CONTENT_SCROLLING;
     }
     return;
   }
   ProcessEventForOverscroll(event);
 }
 
 void OverscrollController::DiscardingGestureEvent(
     const blink::WebGestureEvent& gesture) {
   if (scroll_state_ != STATE_UNKNOWN &&
-      (gesture.type == blink::WebInputEvent::GestureScrollEnd ||
-       gesture.type == blink::WebInputEvent::GestureFlingStart)) {
+      (gesture.type() == blink::WebInputEvent::GestureScrollEnd ||
+       gesture.type() == blink::WebInputEvent::GestureFlingStart)) {
     scroll_state_ = STATE_UNKNOWN;
   }
 }
 
 void OverscrollController::Reset() {
   overscroll_mode_ = OVERSCROLL_NONE;
   overscroll_delta_x_ = overscroll_delta_y_ = 0.f;
   scroll_state_ = STATE_UNKNOWN;
 }
 
 void OverscrollController::Cancel() {
   SetOverscrollMode(OVERSCROLL_NONE);
   overscroll_delta_x_ = overscroll_delta_y_ = 0.f;
   scroll_state_ = STATE_UNKNOWN;
 }
 
 bool OverscrollController::DispatchEventCompletesAction (
     const blink::WebInputEvent& event) const {
   if (overscroll_mode_ == OVERSCROLL_NONE)
     return false;
 
   // Complete the overscroll gesture if there was a mouse move or a scroll-end
   // after the threshold.
-  if (event.type != blink::WebInputEvent::MouseMove &&
-      event.type != blink::WebInputEvent::GestureScrollEnd &&
-      event.type != blink::WebInputEvent::GestureFlingStart)
+  if (event.type() != blink::WebInputEvent::MouseMove &&
+      event.type() != blink::WebInputEvent::GestureScrollEnd &&
+      event.type() != blink::WebInputEvent::GestureFlingStart)
     return false;
 
   // Avoid completing the action on GestureScrollEnd generated
   // from the touchpad since it is sent based on a timeout not
   // when the user has stopped interacting.
-  if (event.type == blink::WebInputEvent::GestureScrollEnd &&
+  if (event.type() == blink::WebInputEvent::GestureScrollEnd &&
       IsGestureEventFromTouchpad(event))
     return false;
 
   if (!delegate_)
     return false;
 
   gfx::Rect bounds = delegate_->GetVisibleBounds();
   if (bounds.IsEmpty())
     return false;
 
-  if (event.type == blink::WebInputEvent::GestureFlingStart) {
+  if (event.type() == blink::WebInputEvent::GestureFlingStart) {
     // Check to see if the fling is in the same direction of the overscroll.
     const blink::WebGestureEvent gesture =
         static_cast<const blink::WebGestureEvent&>(event);
     switch (overscroll_mode_) {
       case OVERSCROLL_EAST:
         if (gesture.data.flingStart.velocityX < 0)
           return false;
         break;
       case OVERSCROLL_WEST:
         if (gesture.data.flingStart.velocityX > 0)
@@ skipping 20 matching lines @@
   } else {
     ratio = fabs(overscroll_delta_y_) / bounds.height();
     threshold = GetOverscrollConfig(OVERSCROLL_CONFIG_VERT_THRESHOLD_COMPLETE);
   }
 
   return ratio >= threshold;
 }
 
 bool OverscrollController::DispatchEventResetsState(
     const blink::WebInputEvent& event) const {
-  switch (event.type) {
+  switch (event.type()) {
     case blink::WebInputEvent::MouseWheel: {
       // Only wheel events with precise deltas (i.e. from trackpad) contribute
       // to the overscroll gesture.
       const blink::WebMouseWheelEvent& wheel =
           static_cast<const blink::WebMouseWheelEvent&>(event);
       return !wheel.hasPreciseScrollingDeltas;
     }
 
     // Avoid resetting overscroll on GestureScrollBegin/End generated
     // from the touchpad since it is sent based on a timeout.
     case blink::WebInputEvent::GestureScrollBegin:
     case blink::WebInputEvent::GestureScrollEnd:
       return !IsGestureEventFromTouchpad(event);
 
     case blink::WebInputEvent::GestureScrollUpdate:
     case blink::WebInputEvent::GestureFlingCancel:
       return false;
 
     default:
       // Touch events can arrive during an overscroll gesture initiated by
       // touch-scrolling. These events should not reset the overscroll state.
-      return !blink::WebInputEvent::isTouchEventType(event.type);
+      return !blink::WebInputEvent::isTouchEventType(event.type());
   }
 }
 
 bool OverscrollController::ProcessEventForOverscroll(
     const blink::WebInputEvent& event) {
   bool event_processed = false;
-  switch (event.type) {
+  switch (event.type()) {
     case blink::WebInputEvent::MouseWheel: {
       const blink::WebMouseWheelEvent& wheel =
           static_cast<const blink::WebMouseWheelEvent&>(event);
       if (!wheel.hasPreciseScrollingDeltas)
         break;
       event_processed =
           ProcessOverscroll(wheel.deltaX * wheel.accelerationRatioX,
                             wheel.deltaY * wheel.accelerationRatioY, true);
       break;
     }
@@ skipping 26 matching lines @@
           break;
         }
       }
 
       // Reset overscroll state if fling didn't complete the overscroll gesture.
       SetOverscrollMode(OVERSCROLL_NONE);
       break;
     }
 
     default:
-      DCHECK(blink::WebInputEvent::isGestureEventType(event.type) ||
-             blink::WebInputEvent::isTouchEventType(event.type))
-          << "Received unexpected event: " << event.type;
+      DCHECK(blink::WebInputEvent::isGestureEventType(event.type()) ||
+             blink::WebInputEvent::isTouchEventType(event.type()))
+          << "Received unexpected event: " << event.type();
   }
   return event_processed;
 }
 
 bool OverscrollController::ProcessOverscroll(float delta_x,
                                              float delta_y,
                                              bool is_touchpad) {
   if (scroll_state_ != STATE_CONTENT_SCROLLING)
     overscroll_delta_x_ += delta_x;
   overscroll_delta_y_ += delta_y;
@@ skipping 78 matching lines @@
   overscroll_mode_ = mode;
   if (overscroll_mode_ == OVERSCROLL_NONE)
     overscroll_delta_x_ = overscroll_delta_y_ = 0.f;
   else
     scroll_state_ = STATE_OVERSCROLLING;
   if (delegate_)
     delegate_->OnOverscrollModeChange(old_mode, overscroll_mode_);
 }
 
 }  // namespace content