Collapse the API surface on WebInputEvent via accessor functions.

third_party/WebKit/Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 692 matching lines @@
 
 void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event) {
   DCHECK(parent()->isFrameView());
 
   // We cache the parent FrameView here as the plugin widget could be deleted
   // in the call to HandleEvent. See http://b/issue?id=1362948
   FrameView* parentView = toFrameView(parent());
 
   WebMouseEventBuilder webEvent(this, LayoutItem(m_element->layoutObject()),
                                 *event);
-  if (webEvent.type == WebInputEvent::Undefined)
+  if (webEvent.type() == WebInputEvent::Undefined)
     return;
 
   if (event->type() == EventTypeNames::mousedown)
     focusPlugin();
 
   WebCursorInfo cursorInfo;
   if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
       WebInputEventResult::NotHandled)
     event->setDefaultHandled();
 
@@ skipping 31 matching lines @@
   WebPoint dragLocation(event->absoluteLocation().x() - location().x(),
                         event->absoluteLocation().y() - location().y());
 
   m_webPlugin->handleDragStatusUpdate(dragStatus, dragData, dragOperationMask,
                                       dragLocation, dragScreenLocation);
 }
 
 void WebPluginContainerImpl::handleWheelEvent(WheelEvent* event) {
   WebMouseWheelEventBuilder webEvent(
       this, LayoutItem(m_element->layoutObject()), *event);
-  if (webEvent.type == WebInputEvent::Undefined)
+  if (webEvent.type() == WebInputEvent::Undefined)
     return;
 
   WebCursorInfo cursorInfo;
   if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
       WebInputEventResult::NotHandled)
     event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event) {
   WebKeyboardEventBuilder webEvent(*event);
-  if (webEvent.type == WebInputEvent::Undefined)
+  if (webEvent.type() == WebInputEvent::Undefined)
     return;
 
-  if (webEvent.type == WebInputEvent::KeyDown) {
+  if (webEvent.type() == WebInputEvent::KeyDown) {
 #if OS(MACOSX)
-    if ((webEvent.modifiers & WebInputEvent::InputModifiers) ==
+    if ((webEvent.modifiers() & WebInputEvent::InputModifiers) ==
             WebInputEvent::MetaKey
 #else
-    if ((webEvent.modifiers & WebInputEvent::InputModifiers) ==
+    if ((webEvent.modifiers() & WebInputEvent::InputModifiers) ==
             WebInputEvent::ControlKey
 #endif
         && (webEvent.windowsKeyCode == VKEY_C ||
             webEvent.windowsKeyCode == VKEY_INSERT)
         // Only copy if there's a selection, so that we only ever do this
         // for Pepper plugins that support copying.  Windowless NPAPI
         // plugins will get the event as before.
         && m_webPlugin->hasSelection()) {
       copy();
       event->setDefaultHandled();
@@ skipping 13 matching lines @@
     event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::handleTouchEvent(TouchEvent* event) {
   switch (m_touchEventRequestType) {
     case TouchEventRequestTypeNone:
       return;
     case TouchEventRequestTypeRaw: {
       WebTouchEventBuilder webEvent(LayoutItem(m_element->layoutObject()),
                                     *event);
-      if (webEvent.type == WebInputEvent::Undefined)
+      if (webEvent.type() == WebInputEvent::Undefined)
         return;
 
       if (event->type() == EventTypeNames::touchstart)
         focusPlugin();
 
       WebCursorInfo cursorInfo;
       if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
           WebInputEventResult::NotHandled)
         event->setDefaultHandled();
       // FIXME: Can a plugin change the cursor from a touch-event callback?
       return;
     }
     case TouchEventRequestTypeSynthesizedMouse:
       synthesizeMouseEventIfPossible(event);
       return;
   }
 }
 
 void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event) {
   WebGestureEventBuilder webEvent(LayoutItem(m_element->layoutObject()),
                                   *event);
-  if (webEvent.type == WebInputEvent::Undefined)
+  if (webEvent.type() == WebInputEvent::Undefined)
     return;
   if (event->type() == EventTypeNames::gesturetapdown)
     focusPlugin();
   WebCursorInfo cursorInfo;
   if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
       WebInputEventResult::NotHandled) {
     event->setDefaultHandled();
     return;
   }
 
   // FIXME: Can a plugin change the cursor from a touch-event callback?
 }
 
 void WebPluginContainerImpl::synthesizeMouseEventIfPossible(TouchEvent* event) {
   WebMouseEventBuilder webEvent(this, LayoutItem(m_element->layoutObject()),
                                 *event);
-  if (webEvent.type == WebInputEvent::Undefined)
+  if (webEvent.type() == WebInputEvent::Undefined)
     return;
 
   WebCursorInfo cursorInfo;
   if (m_webPlugin->handleInputEvent(webEvent, cursorInfo) !=
       WebInputEventResult::NotHandled)
     event->setDefaultHandled();
 }
 
 void WebPluginContainerImpl::focusPlugin() {
   LocalFrame& containingFrame = toFrameView(parent())->frame();
@@ skipping 92 matching lines @@
     // frame view.
     computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRect);
   }
   getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects);
   // Convert to the plugin position.
   for (size_t i = 0; i < cutOutRects.size(); i++)
     cutOutRects[i].move(-frameRect().x(), -frameRect().y());
 }
 
 }  // namespace blink