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

Side by Side Diff: content/browser/renderer_host/input/gesture_event_packet.cc

Issue 171283002: Always reset touch action at the beginning of a new gesture sequence (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test name. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 GestureEventPacket::GestureSource ToGestureSource(const WebTouchEvent& event) { 17 GestureEventPacket::GestureSource ToGestureSource(const WebTouchEvent& event) {
18 if (!event.touchesLength) 18 if (!event.touchesLength)
19 return GestureEventPacket::INVALID; 19 return GestureEventPacket::INVALID;
20 switch (event.type) { 20 switch (event.type) {
21 case WebInputEvent::TouchStart: 21 case WebInputEvent::TouchStart:
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 != WebTouchPoint::StatePressed) 23 if (event.touches[i].state != WebTouchPoint::StatePressed)
24 return GestureEventPacket::TOUCH_BEGIN; 24 return GestureEventPacket::TOUCH_START;
25 } 25 }
26 return GestureEventPacket::TOUCH_SEQUENCE_BEGIN; 26 return GestureEventPacket::TOUCH_SEQUENCE_START;
27 case WebInputEvent::TouchMove: 27 case WebInputEvent::TouchMove:
28 return GestureEventPacket::TOUCH_MOVE; 28 return GestureEventPacket::TOUCH_MOVE;
29 case WebInputEvent::TouchEnd: 29 case WebInputEvent::TouchEnd:
30 case WebInputEvent::TouchCancel: 30 case WebInputEvent::TouchCancel:
31 for (size_t i = 0; i < event.touchesLength; i++) { 31 for (size_t i = 0; i < event.touchesLength; i++) {
32 if (event.touches[i].state != WebTouchPoint::StateReleased && 32 if (event.touches[i].state != WebTouchPoint::StateReleased &&
33 event.touches[i].state != WebTouchPoint::StateCancelled) { 33 event.touches[i].state != WebTouchPoint::StateCancelled) {
34 return GestureEventPacket::TOUCH_END; 34 return GestureEventPacket::TOUCH_END;
35 } 35 }
36 } 36 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 79 }
80 80
81 GestureEventPacket GestureEventPacket::FromTouchTimeout( 81 GestureEventPacket GestureEventPacket::FromTouchTimeout(
82 const WebGestureEvent& event) { 82 const WebGestureEvent& event) {
83 GestureEventPacket packet(TOUCH_TIMEOUT); 83 GestureEventPacket packet(TOUCH_TIMEOUT);
84 packet.Push(event); 84 packet.Push(event);
85 return packet; 85 return packet;
86 } 86 }
87 87
88 } // namespace content 88 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/gesture_event_packet.h ('k') | content/browser/renderer_host/input/input_router_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698