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; |
(...skipping 18 matching lines...) Expand all Loading... | |
29 GestureEventPacket::GestureSource | 29 GestureEventPacket::GestureSource |
30 ToGestureSource(const WebTouchEvent& event) { | 30 ToGestureSource(const WebTouchEvent& event) { |
31 return IsTouchSequenceStart(event) ? GestureEventPacket::TOUCH_BEGIN | 31 return IsTouchSequenceStart(event) ? GestureEventPacket::TOUCH_BEGIN |
32 : GestureEventPacket::TOUCH; | 32 : GestureEventPacket::TOUCH; |
33 } | 33 } |
34 | 34 |
35 } // namespace | 35 } // namespace |
36 | 36 |
37 GestureEventPacket::GestureEventPacket() | 37 GestureEventPacket::GestureEventPacket() |
38 : gesture_count_(0), | 38 : gesture_count_(0), |
39 gesture_source_(INVALID) {} | 39 gesture_source_(INVALID), |
40 is_independent_(true) {} | |
tdresser
2014/02/03 15:52:58
It feels odd to me that we default this to true, a
tdresser
2014/02/03 18:55:14
Nevermind, this makes sense.
| |
40 | 41 |
41 GestureEventPacket::GestureEventPacket(GestureSource source) | 42 GestureEventPacket::GestureEventPacket(GestureSource source) |
42 : gesture_count_(0), | 43 : gesture_count_(0), |
43 gesture_source_(source) { | 44 gesture_source_(source), |
45 is_independent_(true) { | |
44 DCHECK_NE(gesture_source_, INVALID); | 46 DCHECK_NE(gesture_source_, INVALID); |
45 } | 47 } |
46 | 48 |
47 GestureEventPacket::~GestureEventPacket() {} | 49 GestureEventPacket::~GestureEventPacket() {} |
48 | 50 |
49 void GestureEventPacket::Push(const blink::WebGestureEvent& gesture) { | 51 void GestureEventPacket::Push(const blink::WebGestureEvent& gesture) { |
50 CHECK_LT(gesture_count_, static_cast<size_t>(kMaxGesturesPerTouch)); | 52 CHECK_LT(gesture_count_, static_cast<size_t>(kMaxGesturesPerTouch)); |
51 gestures_[gesture_count_++] = gesture; | 53 gestures_[gesture_count_++] = gesture; |
54 if (gesture.type != WebInputEvent::GestureScrollUpdate && | |
55 gesture.type != WebInputEvent::GestureScrollUpdateWithoutPropagation && | |
56 gesture.type != WebInputEvent::GesturePinchUpdate) | |
57 is_independent_ = false; | |
52 } | 58 } |
53 | 59 |
54 GestureEventPacket GestureEventPacket::FromTouch(const WebTouchEvent& event) { | 60 GestureEventPacket GestureEventPacket::FromTouch(const WebTouchEvent& event) { |
55 return GestureEventPacket(ToGestureSource(event)); | 61 return GestureEventPacket(ToGestureSource(event)); |
56 } | 62 } |
57 | 63 |
58 GestureEventPacket GestureEventPacket::FromTouchTimeout( | 64 GestureEventPacket GestureEventPacket::FromTouchTimeout( |
59 const WebGestureEvent& event) { | 65 const WebGestureEvent& event) { |
60 GestureEventPacket packet(TOUCH_TIMEOUT); | 66 GestureEventPacket packet(TOUCH_TIMEOUT); |
61 packet.Push(event); | 67 packet.Push(event); |
62 return packet; | 68 return packet; |
63 } | 69 } |
64 | 70 |
65 } // namespace content | 71 } // namespace content |
OLD | NEW |