| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/common/input/web_touch_event_traits.h" | 5 #include "content/common/input/web_touch_event_traits.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 return false; | 21 return false; |
| 22 for (size_t i = 0; i < event.touchesLength; ++i) { | 22 for (size_t i = 0; i < event.touchesLength; ++i) { |
| 23 if (event.touches[i].state != state) | 23 if (event.touches[i].state != state) |
| 24 return false; | 24 return false; |
| 25 } | 25 } |
| 26 return true; | 26 return true; |
| 27 } | 27 } |
| 28 | 28 |
| 29 bool WebTouchEventTraits::IsTouchSequenceStart(const WebTouchEvent& event) { | 29 bool WebTouchEventTraits::IsTouchSequenceStart(const WebTouchEvent& event) { |
| 30 DCHECK(event.touchesLength || | 30 DCHECK(event.touchesLength || |
| 31 event.type == WebInputEvent::TouchScrollStarted); | 31 event.type() == WebInputEvent::TouchScrollStarted); |
| 32 if (event.type != WebInputEvent::TouchStart) | 32 if (event.type() != WebInputEvent::TouchStart) |
| 33 return false; | 33 return false; |
| 34 return AllTouchPointsHaveState(event, blink::WebTouchPoint::StatePressed); | 34 return AllTouchPointsHaveState(event, blink::WebTouchPoint::StatePressed); |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool WebTouchEventTraits::IsTouchSequenceEnd(const WebTouchEvent& event) { | 37 bool WebTouchEventTraits::IsTouchSequenceEnd(const WebTouchEvent& event) { |
| 38 if (event.type != WebInputEvent::TouchEnd && | 38 if (event.type() != WebInputEvent::TouchEnd && |
| 39 event.type != WebInputEvent::TouchCancel) | 39 event.type() != WebInputEvent::TouchCancel) |
| 40 return false; | 40 return false; |
| 41 if (!event.touchesLength) | 41 if (!event.touchesLength) |
| 42 return true; | 42 return true; |
| 43 for (size_t i = 0; i < event.touchesLength; ++i) { | 43 for (size_t i = 0; i < event.touchesLength; ++i) { |
| 44 if (event.touches[i].state != blink::WebTouchPoint::StateReleased && | 44 if (event.touches[i].state != blink::WebTouchPoint::StateReleased && |
| 45 event.touches[i].state != blink::WebTouchPoint::StateCancelled) | 45 event.touches[i].state != blink::WebTouchPoint::StateCancelled) |
| 46 return false; | 46 return false; |
| 47 } | 47 } |
| 48 return true; | 48 return true; |
| 49 } | 49 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 60 : WebInputEvent::Blocking; | 60 : WebInputEvent::Blocking; |
| 61 event->setTimeStampSeconds(timestamp_sec); | 61 event->setTimeStampSeconds(timestamp_sec); |
| 62 } | 62 } |
| 63 | 63 |
| 64 void WebTouchEventTraits::ResetTypeAndTouchStates(WebInputEvent::Type type, | 64 void WebTouchEventTraits::ResetTypeAndTouchStates(WebInputEvent::Type type, |
| 65 double timestamp_sec, | 65 double timestamp_sec, |
| 66 WebTouchEvent* event) { | 66 WebTouchEvent* event) { |
| 67 ResetType(type, timestamp_sec, event); | 67 ResetType(type, timestamp_sec, event); |
| 68 | 68 |
| 69 WebTouchPoint::State newState = WebTouchPoint::StateUndefined; | 69 WebTouchPoint::State newState = WebTouchPoint::StateUndefined; |
| 70 switch (event->type) { | 70 switch (event->type()) { |
| 71 case WebInputEvent::TouchStart: | 71 case WebInputEvent::TouchStart: |
| 72 newState = WebTouchPoint::StatePressed; | 72 newState = WebTouchPoint::StatePressed; |
| 73 break; | 73 break; |
| 74 case WebInputEvent::TouchMove: | 74 case WebInputEvent::TouchMove: |
| 75 newState = WebTouchPoint::StateMoved; | 75 newState = WebTouchPoint::StateMoved; |
| 76 break; | 76 break; |
| 77 case WebInputEvent::TouchEnd: | 77 case WebInputEvent::TouchEnd: |
| 78 newState = WebTouchPoint::StateReleased; | 78 newState = WebTouchPoint::StateReleased; |
| 79 break; | 79 break; |
| 80 case WebInputEvent::TouchCancel: | 80 case WebInputEvent::TouchCancel: |
| 81 newState = WebTouchPoint::StateCancelled; | 81 newState = WebTouchPoint::StateCancelled; |
| 82 break; | 82 break; |
| 83 default: | 83 default: |
| 84 NOTREACHED(); | 84 NOTREACHED(); |
| 85 break; | 85 break; |
| 86 } | 86 } |
| 87 for (size_t i = 0; i < event->touchesLength; ++i) | 87 for (size_t i = 0; i < event->touchesLength; ++i) |
| 88 event->touches[i].state = newState; | 88 event->touches[i].state = newState; |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace content | 91 } // namespace content |
| OLD | NEW |