Chromium Code Reviews| 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/browser/renderer_host/input/gesture_event_packet.h" | 5 #include "content/browser/renderer_host/input/gesture_event_packet.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 using blink::WebGestureEvent; | 9 using blink::WebGestureEvent; |
| 10 using blink::WebInputEvent; | 10 using blink::WebInputEvent; |
| 11 using blink::WebTouchEvent; | 11 using blink::WebTouchEvent; |
| 12 using blink::WebTouchPoint; | 12 using blink::WebTouchPoint; |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 bool IsTouchSequenceStart(const WebTouchEvent& event) { | |
| 18 if (event.type != WebInputEvent::TouchStart) | |
| 19 return false; | |
| 20 if (!event.touchesLength) | |
| 21 return false; | |
| 22 for (size_t i = 0; i < event.touchesLength; i++) { | |
| 23 if (event.touches[i].state != WebTouchPoint::StatePressed) | |
| 24 return false; | |
| 25 } | |
| 26 return true; | |
| 27 } | |
| 28 | |
| 29 GestureEventPacket::GestureSource | 17 GestureEventPacket::GestureSource |
| 30 ToGestureSource(const WebTouchEvent& event) { | 18 ToGestureSource(const WebTouchEvent& event) { |
| 31 return IsTouchSequenceStart(event) ? GestureEventPacket::TOUCH_BEGIN | 19 switch(event.type) { |
| 32 : GestureEventPacket::TOUCH; | 20 case WebInputEvent::TouchStart: |
| 21 if (!event.touchesLength) | |
| 22 return GestureEventPacket::OUT_OF_ORDER; | |
|
jdduke (slow)
2014/02/13 19:40:00
I'm not sure about the OUT_OF_ORDER source... the
tdresser
2014/02/13 20:34:31
Done.
| |
| 23 for (size_t i = 0; i < event.touchesLength; i++) { | |
| 24 if (event.touches[i].state != WebTouchPoint::StatePressed) | |
| 25 return GestureEventPacket::TOUCH_BEGIN; | |
| 26 } | |
| 27 return GestureEventPacket::TOUCH_SEQUENCE_BEGIN; | |
| 28 case WebInputEvent::TouchMove: | |
| 29 return GestureEventPacket::TOUCH_MOVE; | |
| 30 case WebInputEvent::TouchEnd: | |
| 31 case WebInputEvent::TouchCancel: | |
| 32 if (!event.touchesLength) | |
| 33 return GestureEventPacket::OUT_OF_ORDER; | |
| 34 for (size_t i = 0; i < event.touchesLength; i++) { | |
| 35 if (event.touches[i].state != WebTouchPoint::StateReleased && | |
| 36 event.touches[i].state != WebTouchPoint::StateCancelled) { | |
| 37 return GestureEventPacket::TOUCH_END; | |
| 38 } | |
| 39 } | |
| 40 return GestureEventPacket::TOUCH_SEQUENCE_END; | |
| 41 default: | |
| 42 return GestureEventPacket::OUT_OF_ORDER; | |
| 43 } | |
| 33 } | 44 } |
| 34 | 45 |
| 35 } // namespace | 46 } // namespace |
| 36 | 47 |
| 37 GestureEventPacket::GestureEventPacket() | 48 GestureEventPacket::GestureEventPacket() |
| 38 : gesture_count_(0), | 49 : gesture_count_(0), |
| 39 gesture_source_(INVALID) {} | 50 gesture_source_(INVALID) {} |
| 40 | 51 |
| 41 GestureEventPacket::GestureEventPacket(GestureSource source) | 52 GestureEventPacket::GestureEventPacket(GestureSource source) |
| 42 : gesture_count_(0), | 53 : gesture_count_(0), |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 56 } | 67 } |
| 57 | 68 |
| 58 GestureEventPacket GestureEventPacket::FromTouchTimeout( | 69 GestureEventPacket GestureEventPacket::FromTouchTimeout( |
| 59 const WebGestureEvent& event) { | 70 const WebGestureEvent& event) { |
| 60 GestureEventPacket packet(TOUCH_TIMEOUT); | 71 GestureEventPacket packet(TOUCH_TIMEOUT); |
| 61 packet.Push(event); | 72 packet.Push(event); |
| 62 return packet; | 73 return packet; |
| 63 } | 74 } |
| 64 | 75 |
| 65 } // namespace content | 76 } // namespace content |
| OLD | NEW |