| Index: content/common/input/web_touch_event_traits.cc
|
| diff --git a/content/common/input/web_touch_event_traits.cc b/content/common/input/web_touch_event_traits.cc
|
| index dbd0630f3a17fa443d6e1a274d7030e377c4f0bd..cc96813ea0760eca5009de8aa70c7963db76817a 100644
|
| --- a/content/common/input/web_touch_event_traits.cc
|
| +++ b/content/common/input/web_touch_event_traits.cc
|
| @@ -28,15 +28,15 @@ bool WebTouchEventTraits::AllTouchPointsHaveState(
|
|
|
| bool WebTouchEventTraits::IsTouchSequenceStart(const WebTouchEvent& event) {
|
| DCHECK(event.touchesLength ||
|
| - event.type == WebInputEvent::TouchScrollStarted);
|
| - if (event.type != WebInputEvent::TouchStart)
|
| + event.type() == WebInputEvent::TouchScrollStarted);
|
| + if (event.type() != WebInputEvent::TouchStart)
|
| return false;
|
| return AllTouchPointsHaveState(event, blink::WebTouchPoint::StatePressed);
|
| }
|
|
|
| bool WebTouchEventTraits::IsTouchSequenceEnd(const WebTouchEvent& event) {
|
| - if (event.type != WebInputEvent::TouchEnd &&
|
| - event.type != WebInputEvent::TouchCancel)
|
| + if (event.type() != WebInputEvent::TouchEnd &&
|
| + event.type() != WebInputEvent::TouchCancel)
|
| return false;
|
| if (!event.touchesLength)
|
| return true;
|
| @@ -67,7 +67,7 @@ void WebTouchEventTraits::ResetTypeAndTouchStates(WebInputEvent::Type type,
|
| ResetType(type, timestamp_sec, event);
|
|
|
| WebTouchPoint::State newState = WebTouchPoint::StateUndefined;
|
| - switch (event->type) {
|
| + switch (event->type()) {
|
| case WebInputEvent::TouchStart:
|
| newState = WebTouchPoint::StatePressed;
|
| break;
|
|
|