| Index: content/common/input/synthetic_web_input_event_builders.cc
|
| diff --git a/content/common/input/synthetic_web_input_event_builders.cc b/content/common/input/synthetic_web_input_event_builders.cc
|
| index cb772c21a1571c3edc0875d0851dbd0ddcc0b990..2dd84c6f4bbd77455c29ed848bf76cbf18a3c024 100644
|
| --- a/content/common/input/synthetic_web_input_event_builders.cc
|
| +++ b/content/common/input/synthetic_web_input_event_builders.cc
|
| @@ -181,7 +181,7 @@ void SyntheticWebTouchEvent::ResetPoints() {
|
| ++point;
|
| }
|
| touchesLength = point;
|
| - type = WebInputEvent::Undefined;
|
| + m_type = WebInputEvent::Undefined;
|
| movedBeyondSlopRegion = false;
|
| uniqueTouchEventId = ui::GetNextTouchEventId();
|
| }
|
| @@ -199,7 +199,7 @@ int SyntheticWebTouchEvent::PressPoint(float x, float y) {
|
| point.force = 1.f;
|
| point.tiltX = point.tiltY = 0;
|
| ++touchesLength;
|
| - WebTouchEventTraits::ResetType(WebInputEvent::TouchStart, timeStampSeconds,
|
| + WebTouchEventTraits::ResetType(WebInputEvent::TouchStart, timeStampSeconds(),
|
| this);
|
| return point.id;
|
| }
|
| @@ -214,7 +214,7 @@ void SyntheticWebTouchEvent::MovePoint(int index, float x, float y) {
|
| 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);
|
| }
|
|
|
| @@ -222,7 +222,7 @@ 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);
|
| }
|
|
|
| @@ -230,7 +230,7 @@ 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);
|
| }
|
|
|
|
|