Collapse the API surface on WebInputEvent via accessor functions.

content/browser/frame_host/render_widget_host_view_guest.cc

 // Copyright 2014 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/frame_host/render_widget_host_view_guest.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 162 matching lines @@
     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) {
   // TODO(tdresser): Since all ProcessAckedTouchEvent() uses is the event id,
   // don't pass the full event object here. https://crbug.com/550581.
   GetOwnerRenderWidgetHostView()->ProcessAckedTouchEvent(touch, ack_result);
 }
 #endif
 
 void RenderWidgetHostViewGuest::ProcessMouseEvent(
     const blink::WebMouseEvent& event,
     const ui::LatencyInfo& latency) {
-  if (event.type == blink::WebInputEvent::MouseDown) {
+  if (event.type() == blink::WebInputEvent::MouseDown) {
     DCHECK(guest_->GetOwnerRenderWidgetHostView());
     RenderWidgetHost* embedder =
         guest_->GetOwnerRenderWidgetHostView()->GetRenderWidgetHost();
     if (!embedder->GetView()->HasFocus())
       embedder->GetView()->Focus();
 
     // With direct routing, the embedder would not know to focus the guest on
     // click. Sends a synthetic event for the focusing side effect.
     // TODO(wjmaclean): When we remove BrowserPlugin, delete this code.
     // http://crbug.com/533069
     MaybeSendSyntheticTapGesture(
         blink::WebFloatPoint(event.x, event.y),
         blink::WebFloatPoint(event.globalX, event.globalY));
   }
   host_->ForwardMouseEventWithLatencyInfo(event, latency);
 }
 
 void RenderWidgetHostViewGuest::ProcessTouchEvent(
     const blink::WebTouchEvent& event,
     const ui::LatencyInfo& latency) {
-  if (event.type == blink::WebInputEvent::TouchStart) {
+  if (event.type() == blink::WebInputEvent::TouchStart) {
     DCHECK(guest_->GetOwnerRenderWidgetHostView());
     RenderWidgetHost* embedder =
         guest_->GetOwnerRenderWidgetHostView()->GetRenderWidgetHost();
     if (!embedder->GetView()->HasFocus())
       embedder->GetView()->Focus();
 
     // With direct routing, the embedder would not know to focus the guest on
     // touch. Sends a synthetic event for the focusing side effect.
     // TODO(wjmaclean): When we remove BrowserPlugin, delete this code.
     // http://crbug.com/533069
@@ skipping 375 matching lines @@
   }
 }
 
 void RenderWidgetHostViewGuest::GestureEventAck(
     const blink::WebGestureEvent& event,
     InputEventAckState ack_result) {
   bool not_consumed = ack_result == INPUT_EVENT_ACK_STATE_NOT_CONSUMED ||
                       ack_result == INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
   // GestureScrollBegin/End are always consumed by the guest, so we only
   // forward GestureScrollUpdate.
-  if (event.type == blink::WebInputEvent::GestureScrollUpdate && not_consumed)
+  if (event.type() == blink::WebInputEvent::GestureScrollUpdate && not_consumed)
     guest_->ResendEventToEmbedder(event);
 }
 
 bool RenderWidgetHostViewGuest::IsRenderWidgetHostViewGuest() {
   return true;
 }
 
 void RenderWidgetHostViewGuest::OnHandleInputEvent(
     RenderWidgetHostImpl* embedder,
     int browser_plugin_instance_id,
     const blink::WebInputEvent* event) {
   // WebMouseWheelEvents go into a queue, and may not be forwarded to the
   // renderer until after this method goes out of scope. Therefore we need to
   // explicitly remove the additional device scale factor from the coordinates
   // before allowing the event to be queued.
   if (IsUseZoomForDSFEnabled() &&
-      event->type == blink::WebInputEvent::MouseWheel) {
+      event->type() == blink::WebInputEvent::MouseWheel) {
     blink::WebMouseWheelEvent rescaled_event =
         *static_cast<const blink::WebMouseWheelEvent*>(event);
     rescaled_event.x /= current_device_scale_factor();
     rescaled_event.y /= current_device_scale_factor();
     rescaled_event.deltaX /= current_device_scale_factor();
     rescaled_event.deltaY /= current_device_scale_factor();
     rescaled_event.wheelTicksX /= current_device_scale_factor();
     rescaled_event.wheelTicksY /= current_device_scale_factor();
     ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
     host_->ForwardWheelEventWithLatencyInfo(rescaled_event, latency_info);
     return;
   }
 
   ScopedInputScaleDisabler disable(host_, current_device_scale_factor());
-  if (blink::WebInputEvent::isMouseEventType(event->type)) {
+  if (blink::WebInputEvent::isMouseEventType(event->type())) {
     // The mouse events for BrowserPlugin are modified by all
     // the CSS transforms applied on the <object> and embedder. As a result of
     // this, the coordinates passed on to the guest renderer are potentially
     // incorrect to determine the position of the context menu(they are not the
     // actual X, Y of the window). As a hack, we report the last location of a
     // right mouse up to the BrowserPluginGuest to inform it of the next
     // potential location for context menu (BUG=470087).
     // TODO(ekaramad): Find a better and more fundamental solution. Could the
     // ContextMenuParams be based on global X, Y?
     const blink::WebMouseEvent& mouse_event =
         static_cast<const blink::WebMouseEvent&>(*event);
     // A MouseDown on the ButtonRight could suggest a ContextMenu.
-    if (guest_ && mouse_event.type == blink::WebInputEvent::MouseDown &&
+    if (guest_ && mouse_event.type() == blink::WebInputEvent::MouseDown &&
         mouse_event.button == blink::WebPointerProperties::Button::Right)
       guest_->SetContextMenuPosition(
           gfx::Point(mouse_event.globalX - GetViewBounds().x(),
                      mouse_event.globalY - GetViewBounds().y()));
     host_->ForwardMouseEvent(mouse_event);
     return;
   }
 
-  if (event->type == blink::WebInputEvent::MouseWheel) {
+  if (event->type() == blink::WebInputEvent::MouseWheel) {
     ui::LatencyInfo latency_info(ui::SourceEventType::WHEEL);
     host_->ForwardWheelEventWithLatencyInfo(
         *static_cast<const blink::WebMouseWheelEvent*>(event), latency_info);
     return;
   }
 
-  if (blink::WebInputEvent::isKeyboardEventType(event->type)) {
+  if (blink::WebInputEvent::isKeyboardEventType(event->type())) {
     if (!embedder->GetLastKeyboardEvent())
       return;
     NativeWebKeyboardEvent keyboard_event(*embedder->GetLastKeyboardEvent());
     host_->ForwardKeyboardEvent(keyboard_event);
     return;
   }
 
-  if (blink::WebInputEvent::isTouchEventType(event->type)) {
-    if (event->type == blink::WebInputEvent::TouchStart &&
+  if (blink::WebInputEvent::isTouchEventType(event->type())) {
+    if (event->type() == blink::WebInputEvent::TouchStart &&
         !embedder->GetView()->HasFocus()) {
       embedder->GetView()->Focus();
     }
     ui::LatencyInfo latency_info(ui::SourceEventType::TOUCH);
     host_->ForwardTouchEventWithLatencyInfo(
         *static_cast<const blink::WebTouchEvent*>(event), latency_info);
     return;
   }
 
-  if (blink::WebInputEvent::isGestureEventType(event->type)) {
+  if (blink::WebInputEvent::isGestureEventType(event->type())) {
     const blink::WebGestureEvent& gesture_event =
         *static_cast<const blink::WebGestureEvent*>(event);
 
     // We don't forward inertial GestureScrollUpdates to the guest anymore
     // since it now receives GestureFlingStart and will have its own fling
     // curve generating GestureScrollUpdate events for it.
     // TODO(wjmaclean): Should we try to avoid creating a fling curve in the
     // embedder renderer in this case? BrowserPlugin can return 'true' for
     // handleInputEvent() on a GestureFlingStart, and we could use this as
     // a signal to let the guest handle the fling, though we'd need to be
     // sure other plugins would behave appropriately (i.e. return 'false').
-    if (gesture_event.type == blink::WebInputEvent::GestureScrollUpdate &&
+    if (gesture_event.type() == blink::WebInputEvent::GestureScrollUpdate &&
         gesture_event.data.scrollUpdate.inertialPhase ==
             blink::WebGestureEvent::MomentumPhase) {
       return;
     }
     host_->ForwardGestureEvent(gesture_event);
     return;
   }
 }
 
 }  // namespace content