Collapse the API surface on WebInputEvent via accessor functions.

ui/events/blink/web_input_event_traits.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 "ui/events/blink/web_input_event_traits.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 
 using base::StringAppendF;
@@ skipping 90 matching lines @@
                 event.movedBeyondSlopRegion, event.uniqueTouchEventId);
   for (unsigned i = 0; i < event.touchesLength; ++i)
     ApppendTouchPointDetails(event.touches[i], result);
   result->append(" ]\n}");
 }
 
 struct WebInputEventToString {
   template <class EventType>
   bool Execute(const WebInputEvent& event, std::string* result) const {
     SStringPrintf(result, "%s (Time: %lf, Modifiers: %d)\n",
-                  WebInputEvent::GetName(event.type), event.timeStampSeconds,
-                  event.modifiers);
+                  WebInputEvent::GetName(event.type()),
+                  event.timeStampSeconds(), event.modifiers());
     const EventType& typed_event = static_cast<const EventType&>(event);
     ApppendEventDetails(typed_event, result);
     return true;
   }
 };
 
 struct WebInputEventSize {
   template <class EventType>
   bool Execute(WebInputEvent::Type /* type */, size_t* type_size) const {
     *type_size = sizeof(EventType);
     return true;
   }
 };
 
 struct WebInputEventClone {
   template <class EventType>
   bool Execute(const WebInputEvent& event,
                ScopedWebInputEvent* scoped_event) const {
-    DCHECK_EQ(sizeof(EventType), event.size);
+    DCHECK_EQ(sizeof(EventType), event.size());
     *scoped_event = ScopedWebInputEvent(
         new EventType(static_cast<const EventType&>(event)));
     return true;
   }
 };
 
 struct WebInputEventDelete {
   template <class EventType>
   bool Execute(WebInputEvent* event, bool* /* dummy_var */) const {
     if (!event)
       return false;
-    DCHECK_EQ(sizeof(EventType), event->size);
+    DCHECK_EQ(sizeof(EventType), event->size());
     delete static_cast<EventType*>(event);
     return true;
   }
 };
 
 template <typename Operator, typename ArgIn, typename ArgOut>
 bool Apply(Operator op,
            WebInputEvent::Type type,
            const ArgIn& arg_in,
            ArgOut* arg_out) {
   if (WebInputEvent::isMouseEventType(type))
     return op.template Execute<WebMouseEvent>(arg_in, arg_out);
   else if (type == WebInputEvent::MouseWheel)
     return op.template Execute<WebMouseWheelEvent>(arg_in, arg_out);
   else if (WebInputEvent::isKeyboardEventType(type))
     return op.template Execute<WebKeyboardEvent>(arg_in, arg_out);
   else if (WebInputEvent::isTouchEventType(type))
     return op.template Execute<WebTouchEvent>(arg_in, arg_out);
   else if (WebInputEvent::isGestureEventType(type))
     return op.template Execute<WebGestureEvent>(arg_in, arg_out);
 
   NOTREACHED() << "Unknown webkit event type " << type;
   return false;
 }
 
 }  // namespace
 
 std::string WebInputEventTraits::ToString(const WebInputEvent& event) {
   std::string result;
-  Apply(WebInputEventToString(), event.type, event, &result);
+  Apply(WebInputEventToString(), event.type(), event, &result);
   return result;
 }
 
 size_t WebInputEventTraits::GetSize(WebInputEvent::Type type) {
   size_t size = 0;
   Apply(WebInputEventSize(), type, type, &size);
   return size;
 }
 
 ScopedWebInputEvent WebInputEventTraits::Clone(const WebInputEvent& event) {
   ScopedWebInputEvent scoped_event;
-  Apply(WebInputEventClone(), event.type, event, &scoped_event);
+  Apply(WebInputEventClone(), event.type(), event, &scoped_event);
   return scoped_event;
 }
 
 void WebInputEventTraits::Delete(WebInputEvent* event) {
   if (!event)
     return;
   bool dummy_var = false;
-  Apply(WebInputEventDelete(), event->type, event, &dummy_var);
+  Apply(WebInputEventDelete(), event->type(), event, &dummy_var);
 }
 
 bool WebInputEventTraits::ShouldBlockEventStream(const WebInputEvent& event) {
-  switch (event.type) {
+  switch (event.type()) {
     case WebInputEvent::MouseDown:
     case WebInputEvent::MouseUp:
     case WebInputEvent::MouseEnter:
     case WebInputEvent::MouseLeave:
     case WebInputEvent::ContextMenu:
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureShowPress:
     case WebInputEvent::GestureTapUnconfirmed:
     case WebInputEvent::GestureTapDown:
@@ skipping 23 matching lines @@
       return true;
   }
 }
 
 bool WebInputEventTraits::CanCauseScroll(
     const blink::WebMouseWheelEvent& event) {
 #if defined(USE_AURA)
   // Scroll events generated from the mouse wheel when the control key is held
   // don't trigger scrolling. Instead, they may cause zooming.
   return event.hasPreciseScrollingDeltas ||
-         (event.modifiers & blink::WebInputEvent::ControlKey) == 0;
+         (event.modifiers() & blink::WebInputEvent::ControlKey) == 0;
 #else
   return true;
 #endif
 }
 
 uint32_t WebInputEventTraits::GetUniqueTouchEventId(
     const WebInputEvent& event) {
-  if (WebInputEvent::isTouchEventType(event.type)) {
+  if (WebInputEvent::isTouchEventType(event.type())) {
     return static_cast<const WebTouchEvent&>(event).uniqueTouchEventId;
   }
   return 0U;
 }
 
 // static
 LatencyInfo WebInputEventTraits::CreateLatencyInfoForWebGestureEvent(
     WebGestureEvent event) {
   SourceEventType source_event_type = SourceEventType::UNKNOWN;
   if (event.sourceDevice == blink::WebGestureDevice::WebGestureDeviceTouchpad) {
     source_event_type = SourceEventType::WHEEL;
   } else if (event.sourceDevice ==
              blink::WebGestureDevice::WebGestureDeviceTouchscreen) {
     source_event_type = SourceEventType::TOUCH;
   }
   LatencyInfo latency_info(source_event_type);
   return latency_info;
 }
 
 }  // namespace ui