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

Unified Diff: ui/events/x/events_x.cc

Issue 1586653002: ui: Fix TouchEvent PointerDetails creation from NativeEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase following X event refactor Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/win/events_win.cc ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/x/events_x.cc
diff --git a/ui/events/x/events_x.cc b/ui/events/x/events_x.cc
index 647b55bdc1272714084dd1ba4c8ce108072b4e0b..c1fc65a46f9ca3ea50c72f7e082a7d211b4e9f37 100644
--- a/ui/events/x/events_x.cc
+++ b/ui/events/x/events_x.cc
@@ -154,20 +154,18 @@ int GetTouchId(const base::NativeEvent& native_event) {
return GetTouchIdFromXEvent(*native_event);
}
-float GetTouchRadiusX(const base::NativeEvent& native_event) {
- return GetTouchRadiusXFromXEvent(*native_event);
-}
-
-float GetTouchRadiusY(const base::NativeEvent& native_event) {
- return GetTouchRadiusYFromXEvent(*native_event);
-}
-
float GetTouchAngle(const base::NativeEvent& native_event) {
return GetTouchAngleFromXEvent(*native_event);
}
-float GetTouchForce(const base::NativeEvent& native_event) {
- return GetTouchForceFromXEvent(*native_event);
+PointerDetails GetTouchPointerDetailsFromNative(
+ const base::NativeEvent& native_event) {
+ return PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,
+ GetTouchRadiusXFromXEvent(*native_event),
+ GetTouchRadiusYFromXEvent(*native_event),
+ GetTouchForceFromXEvent(*native_event),
+ /* tilt_x */ 0.f,
+ /* tilt_y */ 0.f);
}
bool GetScrollOffsets(const base::NativeEvent& native_event,
« no previous file with comments | « ui/events/win/events_win.cc ('k') | ui/events/x/events_x_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698