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

Side by Side 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: Reuploading to try to avoid chunk mismatch. 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 bool IsTouchSequenceStart(const WebTouchEvent& event) { 17 GestureEventPacket::GestureSource ToGestureSource(const WebTouchEvent& event) {
18 if (event.type != WebInputEvent::TouchStart)
19 return false;
20 if (!event.touchesLength) 18 if (!event.touchesLength)
21 return false; 19 return GestureEventPacket::INVALID;
22 for (size_t i = 0; i < event.touchesLength; i++) { 20 switch (event.type) {
23 if (event.touches[i].state != WebTouchPoint::StatePressed) 21 case WebInputEvent::TouchStart:
24 return false; 22 for (size_t i = 0; i < event.touchesLength; i++) {
23 if (event.touches[i].state != WebTouchPoint::StatePressed)
24 return GestureEventPacket::TOUCH_BEGIN;
25 }
26 return GestureEventPacket::TOUCH_SEQUENCE_BEGIN;
27 case WebInputEvent::TouchMove:
28 return GestureEventPacket::TOUCH_MOVE;
29 case WebInputEvent::TouchEnd:
30 case WebInputEvent::TouchCancel:
31 for (size_t i = 0; i < event.touchesLength; i++) {
32 if (event.touches[i].state != WebTouchPoint::StateReleased &&
33 event.touches[i].state != WebTouchPoint::StateCancelled) {
34 return GestureEventPacket::TOUCH_END;
35 }
36 }
37 return GestureEventPacket::TOUCH_SEQUENCE_END;
38 default:
39 return GestureEventPacket::INVALID;
25 } 40 }
26 return true;
27 }
28
29 GestureEventPacket::GestureSource
30 ToGestureSource(const WebTouchEvent& event) {
31 return IsTouchSequenceStart(event) ? GestureEventPacket::TOUCH_BEGIN
32 : GestureEventPacket::TOUCH;
33 } 41 }
34 42
35 } // namespace 43 } // namespace
36 44
37 GestureEventPacket::GestureEventPacket() 45 GestureEventPacket::GestureEventPacket()
38 : gesture_count_(0), 46 : gesture_count_(0),
39 gesture_source_(INVALID) {} 47 gesture_source_(UNDEFINED) {}
40 48
41 GestureEventPacket::GestureEventPacket(GestureSource source) 49 GestureEventPacket::GestureEventPacket(GestureSource source)
42 : gesture_count_(0), 50 : gesture_count_(0),
43 gesture_source_(source) { 51 gesture_source_(source) {
44 DCHECK_NE(gesture_source_, INVALID); 52 DCHECK_NE(gesture_source_, UNDEFINED);
45 } 53 }
46 54
47 GestureEventPacket::~GestureEventPacket() {} 55 GestureEventPacket::~GestureEventPacket() {}
48 56
49 void GestureEventPacket::Push(const blink::WebGestureEvent& gesture) { 57 void GestureEventPacket::Push(const blink::WebGestureEvent& gesture) {
50 CHECK_LT(gesture_count_, static_cast<size_t>(kMaxGesturesPerTouch)); 58 CHECK_LT(gesture_count_, static_cast<size_t>(kMaxGesturesPerTouch));
51 gestures_[gesture_count_++] = gesture; 59 gestures_[gesture_count_++] = gesture;
52 } 60 }
53 61
54 GestureEventPacket GestureEventPacket::FromTouch(const WebTouchEvent& event) { 62 GestureEventPacket GestureEventPacket::FromTouch(const WebTouchEvent& event) {
55 return GestureEventPacket(ToGestureSource(event)); 63 return GestureEventPacket(ToGestureSource(event));
56 } 64 }
57 65
58 GestureEventPacket GestureEventPacket::FromTouchTimeout( 66 GestureEventPacket GestureEventPacket::FromTouchTimeout(
59 const WebGestureEvent& event) { 67 const WebGestureEvent& event) {
60 GestureEventPacket packet(TOUCH_TIMEOUT); 68 GestureEventPacket packet(TOUCH_TIMEOUT);
61 packet.Push(event); 69 packet.Push(event);
62 return packet; 70 return packet;
63 } 71 }
64 72
65 } // namespace content 73 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698