Collapse the API surface on WebInputEvent via accessor functions.

content/renderer/pepper/event_conversion.cc

Index: content/renderer/pepper/event_conversion.cc
diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc
index 0531a223ccc4e5c5a99116f9a69a8a27a536bf46..fd7cf985455692f001e9de67e8c7532cfbf76133 100644
--- a/content/renderer/pepper/event_conversion.cc
+++ b/content/renderer/pepper/event_conversion.cc
@@ -83,7 +83,7 @@ static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_ISRIGHT) ==
               "IsRight should match");
 
 PP_InputEvent_Type ConvertEventTypes(const WebInputEvent& event) {
-  switch (event.type) {
+  switch (event.type()) {
     case WebInputEvent::MouseDown:
       return PP_INPUTEVENT_TYPE_MOUSEDOWN;
     case WebInputEvent::MouseUp:
@@ -143,7 +143,7 @@ int ConvertEventModifiers(int modifiers) {
 InputEventData GetEventWithCommonFieldsAndType(const WebInputEvent& web_event) {
   InputEventData result;
   result.event_type = ConvertEventTypes(web_event);
-  result.event_time_stamp = web_event.timeStampSeconds;
+  result.event_time_stamp = web_event.timeStampSeconds();
   return result;
 }
 
@@ -152,7 +152,7 @@ void AppendKeyEvent(const WebInputEvent& event,
   const WebKeyboardEvent& key_event =
       static_cast<const WebKeyboardEvent&>(event);
   InputEventData result = GetEventWithCommonFieldsAndType(event);
-  result.event_modifiers = ConvertEventModifiers(key_event.modifiers);
+  result.event_modifiers = ConvertEventModifiers(key_event.modifiers());
   result.key_code = key_event.windowsKeyCode;
   result.code = ui::KeycodeConverter::DomCodeToCodeString(
       static_cast<ui::DomCode>(key_event.domCode));
@@ -179,7 +179,7 @@ void AppendCharEvent(const WebInputEvent& event,
   base::i18n::UTF16CharIterator iter(key_event.text, utf16_char_count);
   while (!iter.end()) {
     InputEventData result = GetEventWithCommonFieldsAndType(event);
-    result.event_modifiers = ConvertEventModifiers(key_event.modifiers);
+    result.event_modifiers = ConvertEventModifiers(key_event.modifiers());
     base::WriteUnicodeCharacter(iter.get(), &result.character_text);
 
     result_events->push_back(result);
@@ -204,10 +204,10 @@ void AppendMouseEvent(const WebInputEvent& event,
 
   const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
   InputEventData result = GetEventWithCommonFieldsAndType(event);
-  result.event_modifiers = ConvertEventModifiers(mouse_event.modifiers);
-  if (mouse_event.type == WebInputEvent::MouseDown ||
-      mouse_event.type == WebInputEvent::MouseMove ||
-      mouse_event.type == WebInputEvent::MouseUp) {
+  result.event_modifiers = ConvertEventModifiers(mouse_event.modifiers());
+  if (mouse_event.type() == WebInputEvent::MouseDown ||
+      mouse_event.type() == WebInputEvent::MouseMove ||
+      mouse_event.type() == WebInputEvent::MouseUp) {
     result.mouse_button =
         static_cast<PP_InputEvent_MouseButton>(mouse_event.button);
   }
@@ -224,7 +224,7 @@ void AppendMouseWheelEvent(const WebInputEvent& event,
   const WebMouseWheelEvent& mouse_wheel_event =
       static_cast<const WebMouseWheelEvent&>(event);
   InputEventData result = GetEventWithCommonFieldsAndType(event);
-  result.event_modifiers = ConvertEventModifiers(mouse_wheel_event.modifiers);
+  result.event_modifiers = ConvertEventModifiers(mouse_wheel_event.modifiers());
   result.wheel_delta.x = mouse_wheel_event.deltaX;
   result.wheel_delta.y = mouse_wheel_event.deltaY;
   result.wheel_ticks.x = mouse_wheel_event.wheelTicksX;
@@ -456,12 +456,12 @@ WebMouseEvent* BuildMouseEvent(const InputEventData& event) {
       new WebMouseEvent(type, event.event_modifiers, event.event_time_stamp);
   mouse_event->pointerType = blink::WebPointerProperties::PointerType::Mouse;
   mouse_event->button = static_cast<WebMouseEvent::Button>(event.mouse_button);
-  if (mouse_event->type == WebInputEvent::MouseMove) {
-    if (mouse_event->modifiers & WebInputEvent::LeftButtonDown)
+  if (mouse_event->type() == WebInputEvent::MouseMove) {
+    if (mouse_event->modifiers() & WebInputEvent::LeftButtonDown)
       mouse_event->button = WebMouseEvent::Button::Left;
-    else if (mouse_event->modifiers & WebInputEvent::MiddleButtonDown)
+    else if (mouse_event->modifiers() & WebInputEvent::MiddleButtonDown)
       mouse_event->button = WebMouseEvent::Button::Middle;
-    else if (mouse_event->modifiers & WebInputEvent::RightButtonDown)
+    else if (mouse_event->modifiers() & WebInputEvent::RightButtonDown)
       mouse_event->button = WebMouseEvent::Button::Right;
   }
   mouse_event->x = event.mouse_position.x;
@@ -573,7 +573,7 @@ void CreateInputEventData(const WebInputEvent& event,
                           std::vector<InputEventData>* result) {
   result->clear();
 
-  switch (event.type) {
+  switch (event.type()) {
     case WebInputEvent::MouseDown:
     case WebInputEvent::MouseUp:
     case WebInputEvent::MouseMove:
@@ -686,8 +686,8 @@ std::vector<std::unique_ptr<WebInputEvent>> CreateSimulatedWebInputEvents(
 #if defined(OS_WIN)
       WebKeyboardEvent* web_keyboard_event =
           static_cast<WebKeyboardEvent*>(original_event.get());
-      if (web_keyboard_event->type == WebInputEvent::KeyDown)
-        web_keyboard_event->type = WebInputEvent::RawKeyDown;
+      if (web_keyboard_event->type() == WebInputEvent::KeyDown)
+        web_keyboard_event->setType(WebInputEvent::RawKeyDown);
 #endif
       events.push_back(std::move(original_event));
       break;
@@ -710,7 +710,7 @@ std::vector<std::unique_ptr<WebInputEvent>> CreateSimulatedWebInputEvents(
           WebInputEvent::RawKeyDown,
           needs_shift_modifier ? WebInputEvent::ShiftKey
                                : WebInputEvent::NoModifiers,
-          web_char_event->timeStampSeconds));
+          web_char_event->timeStampSeconds()));
       std::unique_ptr<WebKeyboardEvent> key_up_event(new WebKeyboardEvent());
 
       key_down_event->windowsKeyCode = code;
@@ -743,7 +743,7 @@ std::vector<std::unique_ptr<WebInputEvent>> CreateSimulatedWebInputEvents(
 }
 
 PP_InputEvent_Class ClassifyInputEvent(const WebInputEvent& event) {
-  switch (event.type) {
+  switch (event.type()) {
     case WebInputEvent::MouseDown:
     case WebInputEvent::MouseUp:
     case WebInputEvent::MouseMove:
@@ -766,7 +766,7 @@ PP_InputEvent_Class ClassifyInputEvent(const WebInputEvent& event) {
     case WebInputEvent::TouchScrollStarted:
       return PP_InputEvent_Class(0);
     default:
-      CHECK(WebInputEvent::isGestureEventType(event.type));
+      CHECK(WebInputEvent::isGestureEventType(event.type()));
       return PP_InputEvent_Class(0);
   }
 }