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

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

Issue 2634183002: Support multi-button press for synthetic mouse events (Closed)
Patch Set: Test modifiers and button Created 3 years, 11 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
OLDNEW
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 namespace content { 9 namespace content {
10 10
11 SyntheticTouchDriver::SyntheticTouchDriver() { 11 SyntheticTouchDriver::SyntheticTouchDriver() {
12 std::fill(index_map_.begin(), index_map_.end(), -1); 12 std::fill(index_map_.begin(), index_map_.end(), -1);
13 } 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); 17 std::fill(index_map_.begin(), index_map_.end(), -1);
18 } 18 }
19 19
20 SyntheticTouchDriver::~SyntheticTouchDriver() {} 20 SyntheticTouchDriver::~SyntheticTouchDriver() {}
21 21
22 void SyntheticTouchDriver::DispatchEvent(SyntheticGestureTarget* target, 22 void SyntheticTouchDriver::DispatchEvent(SyntheticGestureTarget* target,
23 const base::TimeTicks& timestamp) { 23 const base::TimeTicks& timestamp) {
24 touch_event_.setTimeStampSeconds(ConvertTimestampToSeconds(timestamp)); 24 touch_event_.setTimeStampSeconds(ConvertTimestampToSeconds(timestamp));
25 target->DispatchInputEventToPlatform(touch_event_); 25 if (touch_event_.type() != blink::WebInputEvent::Undefined)
26 target->DispatchInputEventToPlatform(touch_event_);
26 touch_event_.ResetPoints(); 27 touch_event_.ResetPoints();
27 } 28 }
28 29
29 void SyntheticTouchDriver::Press(float x, float y, int index) { 30 void SyntheticTouchDriver::Press(float x, float y, int index, int button) {
30 DCHECK_GE(index, 0); 31 DCHECK_GE(index, 0);
31 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap); 32 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap);
32 int touch_index = touch_event_.PressPoint(x, y); 33 int touch_index = touch_event_.PressPoint(x, y);
33 index_map_[index] = touch_index; 34 index_map_[index] = touch_index;
34 } 35 }
35 36
36 void SyntheticTouchDriver::Move(float x, float y, int index) { 37 void SyntheticTouchDriver::Move(float x, float y, int index) {
37 DCHECK_GE(index, 0); 38 DCHECK_GE(index, 0);
38 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap); 39 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap);
39 touch_event_.MovePoint(index_map_[index], x, y); 40 touch_event_.MovePoint(index_map_[index], x, y);
40 } 41 }
41 42
42 void SyntheticTouchDriver::Release(int index) { 43 void SyntheticTouchDriver::Release(int index, int button) {
43 DCHECK_GE(index, 0); 44 DCHECK_GE(index, 0);
44 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap); 45 DCHECK_LT(index, blink::WebTouchEvent::kTouchesLengthCap);
45 touch_event_.ReleasePoint(index_map_[index]); 46 touch_event_.ReleasePoint(index_map_[index]);
46 index_map_[index] = -1; 47 index_map_[index] = -1;
47 } 48 }
48 49
49 bool SyntheticTouchDriver::UserInputCheck( 50 bool SyntheticTouchDriver::UserInputCheck(
50 const SyntheticPointerActionParams& params) const { 51 const SyntheticPointerActionParams& params) const {
51 if (params.index() < 0 || 52 if (params.index() < 0 ||
52 params.index() >= blink::WebTouchEvent::kTouchesLengthCap) 53 params.index() >= blink::WebTouchEvent::kTouchesLengthCap)
(...skipping 19 matching lines...) Expand all
72 if (params.pointer_action_type() == 73 if (params.pointer_action_type() ==
73 SyntheticPointerActionParams::PointerActionType::RELEASE && 74 SyntheticPointerActionParams::PointerActionType::RELEASE &&
74 index_map_[params.index()] == -1) { 75 index_map_[params.index()] == -1) {
75 return false; 76 return false;
76 } 77 }
77 78
78 return true; 79 return true;
79 } 80 }
80 81
81 } // namespace content 82 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698