Collapse the API surface on WebInputEvent via accessor functions.

third_party/WebKit/Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
   KeyboardEventInit keyEventInit;
   keyEventInit.setBubbles(true);
   keyEventInit.setCancelable(true);
   keyEventInit.setLocation(location);
   return new KeyboardEvent("keydown", keyEventInit);
 }
 
 int getModifiersForKeyLocationCode(KeyboardEvent::KeyLocationCode location) {
   KeyboardEvent* event = createKeyboardEventWithLocation(location);
   WebKeyboardEventBuilder convertedEvent(*event);
-  return convertedEvent.modifiers;
+  return convertedEvent.modifiers();
 }
 
 TEST(WebInputEventConversionTest, WebKeyboardEventBuilder) {
   // Test key location conversion.
   int modifiers =
       getModifiersForKeyLocationCode(KeyboardEvent::kDomKeyLocationStandard);
   EXPECT_FALSE(modifiers & WebInputEvent::IsKeyPad ||
                modifiers & WebInputEvent::IsLeft ||
                modifiers & WebInputEvent::IsRight);
 
@@ skipping 12 matching lines @@
   modifiers =
       getModifiersForKeyLocationCode(KeyboardEvent::kDomKeyLocationNumpad);
   EXPECT_TRUE(modifiers & WebInputEvent::IsKeyPad);
   EXPECT_FALSE(modifiers & WebInputEvent::IsLeft ||
                modifiers & WebInputEvent::IsRight);
 }
 
 TEST(WebInputEventConversionTest, WebMouseEventBuilder) {
   TouchEvent* event = TouchEvent::create();
   WebMouseEventBuilder mouse(0, 0, *event);
-  EXPECT_EQ(WebInputEvent::Undefined, mouse.type);
+  EXPECT_EQ(WebInputEvent::Undefined, mouse.type());
 }
 
 TEST(WebInputEventConversionTest, WebTouchEventBuilder) {
   const std::string baseURL("http://www.test0.com/");
   const std::string fileName("fixed_layout.html");
 
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(baseURL.c_str()),
       WebString::fromUTF8("fixed_layout.html"));
   FrameTestHelpers::WebViewHelper webViewHelper;
@@ skipping 34 matching lines @@
   {
     TouchList* touchList = TouchList::create();
     touchList->append(touch0);
     TouchEvent* touchEvent = TouchEvent::create(
         touchList, touchList, touchList, EventTypeNames::touchstart, domWindow,
         PlatformEvent::NoModifiers, false, false, true, 0, TouchActionAuto,
         WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(1u, webTouchBuilder.touchesLength);
-    EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type);
+    EXPECT_EQ(WebInputEvent::TouchStart, webTouchBuilder.type());
     EXPECT_EQ(WebTouchPoint::StatePressed, webTouchBuilder.touches[0].state);
     EXPECT_FLOAT_EQ(p0.screenPosition.x,
                     webTouchBuilder.touches[0].screenPosition.x);
     EXPECT_FLOAT_EQ(p0.screenPosition.y,
                     webTouchBuilder.touches[0].screenPosition.y);
     EXPECT_FLOAT_EQ(p0.position.x, webTouchBuilder.touches[0].position.x);
     EXPECT_FLOAT_EQ(p0.position.y, webTouchBuilder.touches[0].position.y);
     EXPECT_FLOAT_EQ(p0.radiusX, webTouchBuilder.touches[0].radiusX);
     EXPECT_FLOAT_EQ(p0.radiusY, webTouchBuilder.touches[0].radiusY);
     EXPECT_FLOAT_EQ(p0.rotationAngle, webTouchBuilder.touches[0].rotationAngle);
@@ skipping 24 matching lines @@
     activeTouchList->append(touch1);
     movedTouchList->append(touch0);
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, movedTouchList,
         EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false,
         false, true, 0, TouchActionAuto,
         WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
-    EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
+    EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type());
     EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test touchmove, different point yields same ordering.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* movedTouchList = TouchList::create();
     activeTouchList->append(touch0);
     activeTouchList->append(touch1);
     movedTouchList->append(touch1);
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, movedTouchList,
         EventTypeNames::touchmove, domWindow, PlatformEvent::NoModifiers, false,
         false, true, 0, TouchActionAuto,
         WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
-    EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type);
+    EXPECT_EQ(WebInputEvent::TouchMove, webTouchBuilder.type());
     EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateMoved, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test touchend.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* releasedTouchList = TouchList::create();
     activeTouchList->append(touch0);
     releasedTouchList->append(touch1);
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, releasedTouchList,
         EventTypeNames::touchend, domWindow, PlatformEvent::NoModifiers, false,
         false, false, 0, TouchActionAuto,
         WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
-    EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type);
+    EXPECT_EQ(WebInputEvent::TouchEnd, webTouchBuilder.type());
     EXPECT_EQ(WebTouchPoint::StateStationary, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateReleased, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test touchcancel.
   {
     TouchList* activeTouchList = TouchList::create();
     TouchList* cancelledTouchList = TouchList::create();
     cancelledTouchList->append(touch0);
     cancelledTouchList->append(touch1);
     TouchEvent* touchEvent = TouchEvent::create(
         activeTouchList, activeTouchList, cancelledTouchList,
         EventTypeNames::touchcancel, domWindow, PlatformEvent::NoModifiers,
         false, false, false, 0, TouchActionAuto,
         WebPointerProperties::PointerType::Touch);
 
     WebTouchEventBuilder webTouchBuilder(documentLayoutView, *touchEvent);
     ASSERT_EQ(2u, webTouchBuilder.touchesLength);
-    EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type);
+    EXPECT_EQ(WebInputEvent::TouchCancel, webTouchBuilder.type());
     EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[0].state);
     EXPECT_EQ(WebTouchPoint::StateCancelled, webTouchBuilder.touches[1].state);
     EXPECT_EQ(p0.id, webTouchBuilder.touches[0].id);
     EXPECT_EQ(p1.id, webTouchBuilder.touches[1].id);
     EXPECT_EQ(WebInputEvent::EventNonBlocking, webTouchBuilder.dispatchType);
   }
 
   // Test max point limit.
   {
     TouchList* touchList = TouchList::create();
@@ skipping 601 matching lines @@
     EXPECT_EQ(10.f, platformGestureBuilder.position().x());
     EXPECT_EQ(10.f, platformGestureBuilder.position().y());
     EXPECT_EQ(10.f, platformGestureBuilder.globalPosition().x());
     EXPECT_EQ(10.f, platformGestureBuilder.globalPosition().y());
     EXPECT_EQ(1, platformGestureBuilder.tapCount());
 
     GestureEvent* coreGestureEvent =
         GestureEvent::create(domWindow, platformGestureBuilder);
     WebGestureEventBuilder recreatedWebGestureEvent(documentLayoutView,
                                                     *coreGestureEvent);
-    EXPECT_EQ(webGestureEvent.type, recreatedWebGestureEvent.type);
+    EXPECT_EQ(webGestureEvent.type(), recreatedWebGestureEvent.type());
     EXPECT_EQ(webGestureEvent.x, recreatedWebGestureEvent.x);
     EXPECT_EQ(webGestureEvent.y, recreatedWebGestureEvent.y);
     EXPECT_EQ(webGestureEvent.globalX, recreatedWebGestureEvent.globalX);
     EXPECT_EQ(webGestureEvent.globalY, recreatedWebGestureEvent.globalY);
     EXPECT_EQ(webGestureEvent.data.tap.tapCount,
               recreatedWebGestureEvent.data.tap.tapCount);
   }
 }
 
 TEST(WebInputEventConversionTest, VisualViewportOffset) {
@@ skipping 249 matching lines @@
         document->layoutViewItem(), *event);
     EXPECT_EQ(1, webMouseWheel.wheelTicksX);
     EXPECT_EQ(3, webMouseWheel.wheelTicksY);
     EXPECT_EQ(5, webMouseWheel.deltaX);
     EXPECT_EQ(10, webMouseWheel.deltaY);
     EXPECT_EQ(2, webMouseWheel.globalX);
     EXPECT_EQ(6, webMouseWheel.globalY);
     EXPECT_EQ(10, webMouseWheel.windowX);
     EXPECT_EQ(30, webMouseWheel.windowY);
     EXPECT_TRUE(webMouseWheel.scrollByPage);
-    EXPECT_EQ(WebInputEvent::ControlKey, webMouseWheel.modifiers);
+    EXPECT_EQ(WebInputEvent::ControlKey, webMouseWheel.modifiers());
     EXPECT_EQ(WebInputEvent::RailsModeHorizontal, webMouseWheel.railsMode);
     EXPECT_TRUE(webMouseWheel.hasPreciseScrollingDeltas);
     EXPECT_EQ(WebInputEvent::Blocking, webMouseWheel.dispatchType);
 #if OS(MACOSX)
     EXPECT_EQ(WebMouseWheelEvent::PhaseBegan, webMouseWheel.phase);
     EXPECT_EQ(WebMouseWheelEvent::PhaseChanged, webMouseWheel.momentumPhase);
 #endif
   }
 
   {
@@ skipping 197 matching lines @@
     EXPECT_EQ(ScrollInertialPhaseNonMomentum,
               platformGestureBuilder.inertialPhase());
     EXPECT_TRUE(platformGestureBuilder.synthetic());
     EXPECT_EQ(ScrollGranularity::ScrollByPage,
               platformGestureBuilder.deltaUnits());
     EXPECT_EQ(12345U, platformGestureBuilder.uniqueTouchEventId());
   }
 }
 
 }  // namespace blink