Collapse the API surface on WebInputEvent via accessor functions.

content/common/input/synthetic_web_input_event_builders.cc

 // Copyright 2013 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/common/input/synthetic_web_input_event_builders.h"
 
 #include "base/logging.h"
 #include "content/common/input/web_touch_event_traits.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 171 matching lines @@
         break;
       case WebTouchPoint::StateReleased:
       case WebTouchPoint::StateCancelled:
         touches[i] = WebTouchPoint();
         break;
       case WebTouchPoint::StateUndefined:
         break;
     }
   }
   touchesLength = activePointCount;
-  type = WebInputEvent::Undefined;
+  m_type = WebInputEvent::Undefined;
   movedBeyondSlopRegion = false;
   uniqueTouchEventId = ui::GetNextTouchEventId();
 }
 
 int SyntheticWebTouchEvent::PressPoint(float x, float y) {
   int index = FirstFreeIndex();
   if (index == -1)
     return -1;
   WebTouchPoint& point = touches[index];
   point.id = index;
   point.position.x = point.screenPosition.x = x;
   point.position.y = point.screenPosition.y = y;
   point.state = WebTouchPoint::StatePressed;
   point.radiusX = point.radiusY = 1.f;
   point.rotationAngle = 1.f;
   point.force = 1.f;
   point.tiltX = point.tiltY = 0;
   ++touchesLength;
-  WebTouchEventTraits::ResetType(WebInputEvent::TouchStart, timeStampSeconds,
+  WebTouchEventTraits::ResetType(WebInputEvent::TouchStart, timeStampSeconds(),
                                  this);
   return point.id;
 }
 
 void SyntheticWebTouchEvent::MovePoint(int index, float x, float y) {
   CHECK_GE(index, 0);
   CHECK_LT(index, kTouchesLengthCap);
   // Always set this bit to avoid otherwise unexpected touchmove suppression.
   // The caller can opt-out explicitly, if necessary.
   movedBeyondSlopRegion = true;
   WebTouchPoint& point = touches[index];
   point.position.x = point.screenPosition.x = x;
   point.position.y = point.screenPosition.y = y;
   touches[index].state = WebTouchPoint::StateMoved;
-  WebTouchEventTraits::ResetType(WebInputEvent::TouchMove, timeStampSeconds,
+  WebTouchEventTraits::ResetType(WebInputEvent::TouchMove, timeStampSeconds(),
                                  this);
 }
 
 void SyntheticWebTouchEvent::ReleasePoint(int index) {
   CHECK_GE(index, 0);
   CHECK_LT(index, kTouchesLengthCap);
   touches[index].state = WebTouchPoint::StateReleased;
-  WebTouchEventTraits::ResetType(WebInputEvent::TouchEnd, timeStampSeconds,
+  WebTouchEventTraits::ResetType(WebInputEvent::TouchEnd, timeStampSeconds(),
                                  this);
 }
 
 void SyntheticWebTouchEvent::CancelPoint(int index) {
   CHECK_GE(index, 0);
   CHECK_LT(index, kTouchesLengthCap);
   touches[index].state = WebTouchPoint::StateCancelled;
-  WebTouchEventTraits::ResetType(WebInputEvent::TouchCancel, timeStampSeconds,
+  WebTouchEventTraits::ResetType(WebInputEvent::TouchCancel, timeStampSeconds(),
                                  this);
 }
 
 void SyntheticWebTouchEvent::SetTimestamp(base::TimeTicks timestamp) {
   setTimeStampSeconds(ui::EventTimeStampToSeconds(timestamp));
 }
 
 int SyntheticWebTouchEvent::FirstFreeIndex() {
   for (size_t i = 0; i < kTouchesLengthCap; ++i) {
     if (touches[i].state == WebTouchPoint::StateUndefined)
       return i;
   }
   return -1;
 }
 
 }  // namespace content