Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: content/browser/renderer_host/input/gesture_event_packet.cc

Issue 156783006: Consuming a touch move prevents only the next scroll update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/input/gesture_event_packet.cc
diff --git a/content/browser/renderer_host/input/gesture_event_packet.cc b/content/browser/renderer_host/input/gesture_event_packet.cc
index d0fe17219b9e2ecba7b69d2ed15c5dece4ffba50..5b959531078e5a2121dc69f75081a67169f30ece 100644
--- a/content/browser/renderer_host/input/gesture_event_packet.cc
+++ b/content/browser/renderer_host/input/gesture_event_packet.cc
@@ -14,22 +14,25 @@ using blink::WebTouchPoint;
namespace content {
namespace {
-bool IsTouchSequenceStart(const WebTouchEvent& event) {
- if (event.type != WebInputEvent::TouchStart)
- return false;
- if (!event.touchesLength)
- return false;
- for (size_t i = 0; i < event.touchesLength; i++) {
- if (event.touches[i].state != WebTouchPoint::StatePressed)
- return false;
- }
- return true;
-}
-
GestureEventPacket::GestureSource
ToGestureSource(const WebTouchEvent& event) {
- return IsTouchSequenceStart(event) ? GestureEventPacket::TOUCH_BEGIN
- : GestureEventPacket::TOUCH;
+ switch(event.type) {
+ case WebInputEvent::TouchStart:
+ if (!event.touchesLength)
+ return GestureEventPacket::INVALID;
+ for (size_t i = 0; i < event.touchesLength; i++) {
+ if (event.touches[i].state != WebTouchPoint::StatePressed)
+ return GestureEventPacket::TOUCH_BEGIN;
+ }
+ return GestureEventPacket::TOUCH_SEQUENCE_BEGIN;
+ case WebInputEvent::TouchMove:
+ return GestureEventPacket::TOUCH_MOVE;
+ case WebInputEvent::TouchEnd:
+ case WebInputEvent::TouchCancel:
+ return GestureEventPacket::TOUCH_END;
+ default:
+ return GestureEventPacket::INVALID;
+ }
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698