Collapse the API surface on WebInputEvent via accessor functions.

content/renderer/render_widget_fullscreen_pepper.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/renderer/render_widget_fullscreen_pepper.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 54 matching lines @@
 };
 
 WebMouseEvent WebMouseEventFromGestureEvent(const WebGestureEvent& gesture) {
 
   // Only convert touch screen gesture events, do not convert
   // touchpad/mouse wheel gesture events. (crbug.com/620974)
   if (gesture.sourceDevice != blink::WebGestureDeviceTouchscreen)
     return WebMouseEvent();
 
   WebInputEvent::Type type = WebInputEvent::Undefined;
-  switch (gesture.type) {
+  switch (gesture.type()) {
     case WebInputEvent::GestureScrollBegin:
       type = WebInputEvent::MouseDown;
       break;
     case WebInputEvent::GestureScrollUpdate:
       type = WebInputEvent::MouseMove;
       break;
     case WebInputEvent::GestureFlingStart:
       // A scroll gesture on the touchscreen may end with a GestureScrollEnd
       // when there is no velocity, or a GestureFlingStart when it has a
       // velocity. In both cases, it should end the drag that was initiated by
       // the GestureScrollBegin (and subsequent GestureScrollUpdate) events.
       type = WebInputEvent::MouseUp;
       break;
     case WebInputEvent::GestureScrollEnd:
       type = WebInputEvent::MouseUp;
       break;
     default:
       return WebMouseEvent();
   }
 
-  WebMouseEvent mouse(type, gesture.modifiers | WebInputEvent::LeftButtonDown,
-                      gesture.timeStampSeconds);
+  WebMouseEvent mouse(type, gesture.modifiers() | WebInputEvent::LeftButtonDown,
+                      gesture.timeStampSeconds());
   mouse.button = WebMouseEvent::Button::Left;
-  mouse.clickCount = (mouse.type == WebInputEvent::MouseDown ||
-                      mouse.type == WebInputEvent::MouseUp);
+  mouse.clickCount = (mouse.type() == WebInputEvent::MouseDown ||
+                      mouse.type() == WebInputEvent::MouseUp);
 
   mouse.x = gesture.x;
   mouse.y = gesture.y;
   mouse.windowX = gesture.x;
   mouse.windowY = gesture.y;
   mouse.globalX = gesture.globalX;
   mouse.globalY = gesture.globalY;
 
   return mouse;
 }
@@ skipping 47 matching lines @@
     if (!widget_->plugin())
       return WebInputEventResult::NotHandled;
 
     // This cursor info is ignored, we always set the cursor directly from
     // RenderWidgetFullscreenPepper::DidChangeCursor.
     WebCursorInfo cursor;
 
     // Pepper plugins do not accept gesture events. So do not send the gesture
     // events directly to the plugin. Instead, try to convert them to equivalent
     // mouse events, and then send to the plugin.
-    if (WebInputEvent::isGestureEventType(event.type)) {
+    if (WebInputEvent::isGestureEventType(event.type())) {
       bool result = false;
       const WebGestureEvent* gesture_event =
           static_cast<const WebGestureEvent*>(&event);
-      switch (event.type) {
+      switch (event.type()) {
         case WebInputEvent::GestureTap: {
           WebMouseEvent mouse(WebInputEvent::MouseMove,
-                              gesture_event->modifiers,
-                              gesture_event->timeStampSeconds);
+                              gesture_event->modifiers(),
+                              gesture_event->timeStampSeconds());
           mouse.x = gesture_event->x;
           mouse.y = gesture_event->y;
           mouse.windowX = gesture_event->x;
           mouse.windowY = gesture_event->y;
           mouse.globalX = gesture_event->globalX;
           mouse.globalY = gesture_event->globalY;
           mouse.movementX = 0;
           mouse.movementY = 0;
           result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
 
           mouse.setType(WebInputEvent::MouseDown);
           mouse.button = WebMouseEvent::Button::Left;
           mouse.clickCount = gesture_event->data.tap.tapCount;
           result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
 
           mouse.setType(WebInputEvent::MouseUp);
           result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
           break;
         }
 
         default: {
           WebMouseEvent mouse = WebMouseEventFromGestureEvent(*gesture_event);
-          if (mouse.type != WebInputEvent::Undefined)
+          if (mouse.type() != WebInputEvent::Undefined)
             result |= widget_->plugin()->HandleInputEvent(mouse, &cursor);
           break;
         }
       }
       return result ? WebInputEventResult::HandledApplication
                     : WebInputEventResult::NotHandled;
     }
 
     bool result = widget_->plugin()->HandleInputEvent(event, &cursor);
 
     // For normal web pages, WebViewImpl does input event translations and
     // generates context menu events. Since we don't have a WebView, we need to
     // do the necessary translation ourselves.
-    if (WebInputEvent::isMouseEventType(event.type)) {
+    if (WebInputEvent::isMouseEventType(event.type())) {
       const WebMouseEvent& mouse_event =
           reinterpret_cast<const WebMouseEvent&>(event);
       bool send_context_menu_event = false;
       // On Mac/Linux, we handle it on mouse down.
       // On Windows, we handle it on mouse up.
 #if defined(OS_WIN)
       send_context_menu_event =
-          mouse_event.type == WebInputEvent::MouseUp &&
+          mouse_event.type() == WebInputEvent::MouseUp &&
           mouse_event.button == WebMouseEvent::Button::Right;
 #elif defined(OS_MACOSX)
       send_context_menu_event =
-          mouse_event.type == WebInputEvent::MouseDown &&
+          mouse_event.type() == WebInputEvent::MouseDown &&
           (mouse_event.button == WebMouseEvent::Button::Right ||
            (mouse_event.button == WebMouseEvent::Button::Left &&
-            mouse_event.modifiers & WebMouseEvent::ControlKey));
+            mouse_event.modifiers() & WebMouseEvent::ControlKey));
 #else
       send_context_menu_event =
-          mouse_event.type == WebInputEvent::MouseDown &&
+          mouse_event.type() == WebInputEvent::MouseDown &&
           mouse_event.button == WebMouseEvent::Button::Right;
 #endif
       if (send_context_menu_event) {
         WebMouseEvent context_menu_event(mouse_event);
-        context_menu_event.type = WebInputEvent::ContextMenu;
+        context_menu_event.setType(WebInputEvent::ContextMenu);
         widget_->plugin()->HandleInputEvent(context_menu_event, &cursor);
       }
     }
     return result ? WebInputEventResult::HandledApplication
                   : WebInputEventResult::NotHandled;
   }
 
  private:
   RenderWidgetFullscreenPepper* widget_;
   WebSize size_;
@@ skipping 129 matching lines @@
 GURL RenderWidgetFullscreenPepper::GetURLForGraphicsContext3D() {
   return active_url_;
 }
 
 void RenderWidgetFullscreenPepper::OnDeviceScaleFactorChanged() {
   if (compositor_)
     compositor_->setDeviceScaleFactor(device_scale_factor_);
 }
 
 }  // namespace content