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

Unified Diff: ui/events/blink/blink_event_util.cc

Issue 2925883003: [Touch Adjustment] Pass primary_pointer_type to WebGestureEvent and disable adjustment for stylus (Closed)
Patch Set: dtapuska's comment: Fix layout test instead Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ui/events/blink/blink_event_util.cc
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
index 7dfbe2912ecc587df6f6949babb5096d4911ac07..824f26212a92d2b766e164a7eb09c833815d8c11 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -119,6 +119,26 @@ WebPointerProperties::PointerType ToWebPointerType(int tool_type) {
return WebPointerProperties::PointerType::kUnknown;
}
+WebPointerProperties::PointerType ToWebPointerType(
+ EventPointerType event_pointer_type) {
+ switch (event_pointer_type) {
+ case EventPointerType::POINTER_TYPE_UNKNOWN:
+ return WebPointerProperties::PointerType::kUnknown;
+ case EventPointerType::POINTER_TYPE_MOUSE:
+ return WebPointerProperties::PointerType::kMouse;
+ case EventPointerType::POINTER_TYPE_PEN:
+ return WebPointerProperties::PointerType::kPen;
+ case EventPointerType::POINTER_TYPE_TOUCH:
+ return WebPointerProperties::PointerType::kTouch;
+ case EventPointerType::POINTER_TYPE_ERASER:
+ return WebPointerProperties::PointerType::kEraser;
+ default:
+ NOTREACHED() << "Invalid EventPointerType = "
+ << static_cast<int>(event_pointer_type);
+ return WebPointerProperties::PointerType::kUnknown;
+ }
+}
+
WebPointerProperties::Button ToWebPointerButton(int android_button_state) {
if (android_button_state & MotionEvent::BUTTON_PRIMARY)
return WebPointerProperties::Button::kLeft;
@@ -498,6 +518,7 @@ std::pair<WebGestureEvent, WebGestureEvent> CoalesceScrollAndPinch(
new_event.TimeStampSeconds());
WebGestureEvent pinch_event;
scroll_event.source_device = new_event.source_device;
+ scroll_event.primary_pointer_type = new_event.primary_pointer_type;
pinch_event = scroll_event;
pinch_event.SetType(WebInputEvent::kGesturePinchUpdate);
pinch_event.x = new_event.GetType() == WebInputEvent::kGesturePinchUpdate
@@ -627,6 +648,8 @@ WebGestureEvent CreateWebGestureEvent(const GestureEventDetails& details,
break;
}
+ gesture.primary_pointer_type =
+ ToWebPointerType(details.primary_pointer_type());
gesture.unique_touch_event_id = unique_touch_event_id;
switch (details.type()) {

Powered by Google App Engine
This is Rietveld 408576698