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

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

Issue 1152463004: Fix motion event orientation handling for styluses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Be more restrictive Created 5 years, 7 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 | « no previous file | ui/events/gesture_detection/motion_event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9a3a648ae3306e5517b87255acd1c5d0f1fac847..75b9e0da97ff92191282a3c895fb38d8ce3edaaf 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -103,9 +103,23 @@ WebTouchPoint CreateWebTouchPoint(const MotionEvent& event,
DCHECK_GE(major_radius, 0);
DCHECK_GE(minor_radius, 0);
DCHECK_GE(major_radius, minor_radius);
- // Allow a small bound tolerance to account for floating point conversion.
- DCHECK_GT(orientation_deg, -90.01f);
- DCHECK_LT(orientation_deg, 90.01f);
+ if (event.GetToolType(pointer_index) == MotionEvent::TOOL_TYPE_STYLUS) {
jdduke (slow) 2015/05/29 14:36:14 I guess at some point we should add some basic tes
+ // Orientation lies in [-180, 180] for a stylus.
tdresser 2015/05/29 15:01:21 Use () for open ranges.
USE eero AT chromium.org 2015/05/29 16:17:47 It is not an open but a closed range. From http:/
tdresser 2015/05/29 16:45:44 Sorry, you're right.
+ // Allow a small bound tolerance to account for floating point conversion.
+ DCHECK_GT(orientation_deg, -180.01f);
+ DCHECK_LT(orientation_deg, 180.01f);
mustaq 2015/05/29 15:11:51 Please create a bug saying that "When Touch.rotati
USE eero AT chromium.org 2015/05/29 16:17:47 Done.
+ if (orientation_deg >= 90.f)
jdduke (slow) 2015/05/29 14:36:14 Where does the spec say it's strictly less than 90
USE eero AT chromium.org 2015/05/29 16:17:47 In section 2.1 the spec says that than rotationAng
+ orientation_deg -= 180.f;
+ else if (orientation_deg < -90.f)
+ orientation_deg += 180.f;
+ } else {
+ // Orientation lies in [-90, 90] for a stylus.
tdresser 2015/05/29 15:01:21 stylus -> touch.
USE eero AT chromium.org 2015/05/29 16:17:47 Done.
+ // Allow a small bound tolerance to account for floating point conversion.
+ DCHECK_GT(orientation_deg, -90.01f);
+ DCHECK_LT(orientation_deg, 90.01f);
+ if (orientation_deg >= 90.f)
jdduke (slow) 2015/05/29 14:36:14 Nit: If we DCHECK, we shouldn't actually fix it if
USE eero AT chromium.org 2015/05/29 16:17:47 There is nothing wrong for orientation_deg to be e
+ orientation_deg -= 180.f;
+ }
if (orientation_deg >= 0) {
// The case orientation_deg == 0 is handled here on purpose: although the
// 'else' block is equivalent in this case, we want to pass the 0 value
« no previous file with comments | « no previous file | ui/events/gesture_detection/motion_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698