OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/synthetic_touch_driver.h" | 5 #include "content/browser/renderer_host/input/synthetic_touch_driver.h" |
6 | 6 |
7 #include "content/browser/renderer_host/input/synthetic_gesture_target.h" | 7 #include "content/browser/renderer_host/input/synthetic_gesture_target.h" |
8 | 8 |
9 using blink::WebTouchEvent; | |
10 | |
11 namespace content { | 9 namespace content { |
12 | 10 |
13 SyntheticTouchDriver::SyntheticTouchDriver() {} | 11 SyntheticTouchDriver::SyntheticTouchDriver() { |
| 12 std::fill(index_map_.begin(), index_map_.end(), -1); |
| 13 } |
14 | 14 |
15 SyntheticTouchDriver::SyntheticTouchDriver(SyntheticWebTouchEvent touch_event) | 15 SyntheticTouchDriver::SyntheticTouchDriver(SyntheticWebTouchEvent touch_event) |
16 : touch_event_(touch_event) {} | 16 : touch_event_(touch_event) { |
| 17 std::fill(index_map_.begin(), index_map_.end(), -1); |
| 18 } |
17 | 19 |
18 SyntheticTouchDriver::~SyntheticTouchDriver() {} | 20 SyntheticTouchDriver::~SyntheticTouchDriver() {} |
19 | 21 |
20 void SyntheticTouchDriver::DispatchEvent(SyntheticGestureTarget* target, | 22 void SyntheticTouchDriver::DispatchEvent(SyntheticGestureTarget* target, |
21 const base::TimeTicks& timestamp) { | 23 const base::TimeTicks& timestamp) { |
22 touch_event_.timeStampSeconds = ConvertTimestampToSeconds(timestamp); | 24 touch_event_.timeStampSeconds = ConvertTimestampToSeconds(timestamp); |
23 target->DispatchInputEventToPlatform(touch_event_); | 25 if (touch_event_.type != blink::WebInputEvent::Undefined) |
| 26 target->DispatchInputEventToPlatform(touch_event_); |
24 touch_event_.ResetPoints(); | 27 touch_event_.ResetPoints(); |
25 } | 28 } |
26 | 29 |
27 int SyntheticTouchDriver::Press(float x, float y) { | 30 void SyntheticTouchDriver::Press(float x, float y, int index) { |
28 int index = touch_event_.PressPoint(x, y); | 31 DCHECK_GE(index, 0); |
29 return index; | 32 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap); |
| 33 int touch_index = touch_event_.PressPoint(x, y); |
| 34 index_map_[index] = touch_index; |
30 } | 35 } |
31 | 36 |
32 void SyntheticTouchDriver::Move(float x, float y, int index) { | 37 void SyntheticTouchDriver::Move(float x, float y, int index) { |
33 touch_event_.MovePoint(index, x, y); | 38 DCHECK_GE(index, 0); |
| 39 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap); |
| 40 touch_event_.MovePoint(index_map_[index], x, y); |
34 } | 41 } |
35 | 42 |
36 void SyntheticTouchDriver::Release(int index) { | 43 void SyntheticTouchDriver::Release(int index) { |
37 touch_event_.ReleasePoint(index); | 44 DCHECK_GE(index, 0); |
| 45 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap); |
| 46 touch_event_.ReleasePoint(index_map_[index]); |
| 47 index_map_[index] = -1; |
38 } | 48 } |
39 | 49 |
40 bool SyntheticTouchDriver::UserInputCheck( | 50 bool SyntheticTouchDriver::UserInputCheck( |
41 const SyntheticPointerActionParams& params) const { | 51 const SyntheticPointerActionParams& params) const { |
42 DCHECK_GE(params.index(), -1); | 52 if (params.index() < 0 || |
43 DCHECK_LT(params.index(), WebTouchEvent::kTouchesLengthCap); | 53 params.index() >= blink::WebTouchEvent::kTouchesLengthCap) |
44 if (params.gesture_source_type != SyntheticGestureParams::TOUCH_INPUT) | |
45 return false; | 54 return false; |
46 | 55 |
47 if (params.pointer_action_type() == | 56 if (params.pointer_action_type() == |
48 SyntheticPointerActionParams::PointerActionType::NOT_INITIALIZED) { | 57 SyntheticPointerActionParams::PointerActionType::NOT_INITIALIZED) { |
49 return false; | 58 return false; |
50 } | 59 } |
51 | 60 |
52 if (params.pointer_action_type() == | 61 if (params.pointer_action_type() == |
53 SyntheticPointerActionParams::PointerActionType::PRESS && | 62 SyntheticPointerActionParams::PointerActionType::PRESS && |
54 params.index() >= 0) { | 63 index_map_[params.index()] >= 0) { |
55 return false; | 64 return false; |
56 } | 65 } |
57 | 66 |
58 if (params.pointer_action_type() == | 67 if (params.pointer_action_type() == |
59 SyntheticPointerActionParams::PointerActionType::MOVE && | 68 SyntheticPointerActionParams::PointerActionType::MOVE && |
60 params.index() == -1) { | 69 index_map_[params.index()] == -1) { |
61 return false; | 70 return false; |
62 } | 71 } |
63 | 72 |
64 if (params.pointer_action_type() == | 73 if (params.pointer_action_type() == |
65 SyntheticPointerActionParams::PointerActionType::RELEASE && | 74 SyntheticPointerActionParams::PointerActionType::RELEASE && |
66 params.index() == -1) { | 75 index_map_[params.index()] == -1) { |
67 return false; | 76 return false; |
68 } | 77 } |
69 | 78 |
70 return true; | 79 return true; |
71 } | 80 } |
72 | 81 |
73 } // namespace content | 82 } // namespace content |
OLD | NEW |