Collapse the API surface on WebInputEvent via accessor functions.

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 1348 matching lines @@
   // Propagation to inner frames is handled below this function.
   ASSERT(m_frame == m_frame->localFrameRoot());
 
   // Non-scrolling related gesture events do a single cross-frame hit-test and
   // jump directly to the inner most frame. This matches handleMousePressEvent
   // etc.
   ASSERT(!targetedEvent.event().isScrollEvent());
 
   // Update mouseout/leave/over/enter events before jumping directly to the
   // inner most frame.
-  if (targetedEvent.event().type == WebInputEvent::GestureTap)
+  if (targetedEvent.event().type() == WebInputEvent::GestureTap)
     updateGestureTargetNodeForMouseEvent(targetedEvent);
 
   // Route to the correct frame.
   if (LocalFrame* innerFrame = targetedEvent.hitTestResult().innerNodeFrame())
     return innerFrame->eventHandler().handleGestureEventInFrame(targetedEvent);
 
   // No hit test result, handle in root instance. Perhaps we should just return
   // false instead?
   return m_gestureManager->handleGestureEventInFrame(targetedEvent);
 }
@@ skipping 230 matching lines @@
                                  : nullptr;
       if (exitedFrameInDocument != lastEnteredFrameInDocument)
         exitedFrameChain.push_back(exitedFrameInDocument);
       else if (nextExitedFrameInDocument && indexEnteredFrameChain)
         --indexEnteredFrameChain;
     }
     exitedFrameInDocument = nextExitedFrameInDocument;
   }
 
   const WebGestureEvent& gestureEvent = targetedEvent.event();
-  unsigned modifiers = gestureEvent.modifiers;
+  unsigned modifiers = gestureEvent.modifiers();
   PlatformMouseEvent fakeMouseMove(
       gestureEvent, WebPointerProperties::Button::NoButton,
       PlatformEvent::MouseMoved,
       /* clickCount */ 0, static_cast<PlatformEvent::Modifiers>(modifiers),
       PlatformMouseEvent::FromTouch,
-      TimeTicks::FromSeconds(gestureEvent.timeStampSeconds),
+      TimeTicks::FromSeconds(gestureEvent.timeStampSeconds()),
       WebPointerProperties::PointerType::Mouse);
 
   // Update the mouseout/mouseleave event
   size_t indexExitedFrameChain = exitedFrameChain.size();
   while (indexExitedFrameChain) {
     LocalFrame* leaveFrame = exitedFrameChain[--indexExitedFrameChain];
     leaveFrame->eventHandler().m_mouseEventManager->setNodeUnderMouse(
         updateMouseEventTargetNode(nullptr), fakeMouseMove);
   }
 
@@ skipping 14 matching lines @@
 GestureEventWithHitTestResults EventHandler::targetGestureEvent(
     const WebGestureEvent& gestureEvent,
     bool readOnly) {
   TRACE_EVENT0("input", "EventHandler::targetGestureEvent");
 
   ASSERT(m_frame == m_frame->localFrameRoot());
   // Scrolling events get hit tested per frame (like wheel events do).
   ASSERT(!gestureEvent.isScrollEvent());
 
   HitTestRequest::HitTestRequestType hitType =
-      m_gestureManager->getHitTypeForGestureType(gestureEvent.type);
+      m_gestureManager->getHitTypeForGestureType(gestureEvent.type());
   TimeDelta activeInterval;
   bool shouldKeepActiveForMinInterval = false;
   if (readOnly) {
     hitType |= HitTestRequest::ReadOnly;
-  } else if (gestureEvent.type == WebInputEvent::GestureTap) {
+  } else if (gestureEvent.type() == WebInputEvent::GestureTap) {
     // If the Tap is received very shortly after ShowPress, we want to
     // delay clearing of the active state so that it's visible to the user
     // for at least a couple of frames.
     activeInterval =
         TimeTicks::Now() - m_gestureManager->getLastShowPressTimestamp();
     shouldKeepActiveForMinInterval =
         !m_gestureManager->getLastShowPressTimestamp().isNull() &&
         activeInterval < minimumActiveInterval;
     if (shouldKeepActiveForMinInterval)
       hitType |= HitTestRequest::ReadOnly;
@@ skipping 68 matching lines @@
 }
 
 void EventHandler::applyTouchAdjustment(WebGestureEvent* gestureEvent,
                                         HitTestResult* hitTestResult) {
   if (!shouldApplyTouchAdjustment(*gestureEvent))
     return;
 
   Node* adjustedNode = nullptr;
   IntPoint adjustedPoint = flooredIntPoint(gestureEvent->positionInRootFrame());
   bool adjusted = false;
-  switch (gestureEvent->type) {
+  switch (gestureEvent->type()) {
     case WebInputEvent::GestureTap:
     case WebInputEvent::GestureTapUnconfirmed:
     case WebInputEvent::GestureTapDown:
     case WebInputEvent::GestureShowPress:
       adjusted = bestClickableNodeForHitTestResult(*hitTestResult,
                                                    adjustedPoint, adjustedNode);
       break;
     case WebInputEvent::GestureLongPress:
     case WebInputEvent::GestureLongTap:
     case WebInputEvent::GestureTwoFingerTap:
@@ skipping 359 matching lines @@
 }
 
 FrameHost* EventHandler::frameHost() const {
   if (!m_frame->page())
     return nullptr;
 
   return &m_frame->page()->frameHost();
 }
 
 }  // namespace blink