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

Unified Diff: ui/events/events_default.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/event_utils.h ('k') | ui/events/events_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/events_default.cc
diff --git a/ui/events/events_default.cc b/ui/events/events_default.cc
index 7d55e8e790f8146be62ce2d8930fe9b43e165896..b6bf22e7d0df5581ed0de1cd6ead388f4bfb7813 100644
--- a/ui/events/events_default.cc
+++ b/ui/events/events_default.cc
@@ -96,18 +96,12 @@ int GetTouchId(const base::NativeEvent& native_event) {
return event->touch_id();
}
-float GetTouchRadiusX(const base::NativeEvent& native_event) {
- const ui::TouchEvent* event =
- static_cast<const ui::TouchEvent*>(native_event);
- DCHECK(event->IsTouchEvent());
- return event->pointer_details().radius_x();
-}
-
-float GetTouchRadiusY(const base::NativeEvent& native_event) {
+PointerDetails GetTouchPointerDetailsFromNative(
+ const base::NativeEvent& native_event) {
const ui::TouchEvent* event =
static_cast<const ui::TouchEvent*>(native_event);
DCHECK(event->IsTouchEvent());
- return event->pointer_details().radius_y();
+ return event->pointer_details();
}
float GetTouchAngle(const base::NativeEvent& native_event) {
@@ -117,13 +111,6 @@ float GetTouchAngle(const base::NativeEvent& native_event) {
return event->rotation_angle();
}
-float GetTouchForce(const base::NativeEvent& native_event) {
- const ui::TouchEvent* event =
- static_cast<const ui::TouchEvent*>(native_event);
- DCHECK(event->IsTouchEvent());
- return event->pointer_details().force();
-}
-
bool GetScrollOffsets(const base::NativeEvent& native_event,
float* x_offset,
float* y_offset,
« no previous file with comments | « ui/events/event_utils.h ('k') | ui/events/events_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698