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

Side by Side Diff: ui/events/blink/blink_event_util.cc

Issue 1147083005: Separate motion event touch geometry orientation from stylus orientation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Aura Created 5 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 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 // MSVC++ requires this to be set before any other includes to get M_PI. 5 // MSVC++ requires this to be set before any other includes to get M_PI.
6 #define _USE_MATH_DEFINES 6 #define _USE_MATH_DEFINES
7 7
8 #include "ui/events/blink/blink_event_util.h" 8 #include "ui/events/blink/blink_event_util.h"
9 9
10 #include <cmath> 10 #include <cmath>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // using two radii along x- & y-axes and a positive acute rotation angle in 92 // using two radii along x- & y-axes and a positive acute rotation angle in
93 // degrees. See: 93 // degrees. See:
94 // http://dvcs.w3.org/hg/webevents/raw-file/default/touchevents.html 94 // http://dvcs.w3.org/hg/webevents/raw-file/default/touchevents.html
95 95
96 float major_radius = event.GetTouchMajor(pointer_index) / 2.f; 96 float major_radius = event.GetTouchMajor(pointer_index) / 2.f;
97 float minor_radius = event.GetTouchMinor(pointer_index) / 2.f; 97 float minor_radius = event.GetTouchMinor(pointer_index) / 2.f;
98 98
99 DCHECK_LE(minor_radius, major_radius); 99 DCHECK_LE(minor_radius, major_radius);
100 DCHECK_IMPLIES(major_radius, minor_radius); 100 DCHECK_IMPLIES(major_radius, minor_radius);
101 101
102 float orientation_deg = event.GetOrientation(pointer_index) * 180.f / M_PI; 102 float orientation_deg =
103 event.GetTouchOrientation(pointer_index) * 180.f / M_PI;
103 DCHECK_GE(major_radius, 0); 104 DCHECK_GE(major_radius, 0);
104 DCHECK_GE(minor_radius, 0); 105 DCHECK_GE(minor_radius, 0);
105 DCHECK_GE(major_radius, minor_radius); 106 DCHECK_GE(major_radius, minor_radius);
106 // Allow a small bound tolerance to account for floating point conversion. 107 // Allow a small bound tolerance to account for floating point conversion.
107 DCHECK_GT(orientation_deg, -90.01f); 108 DCHECK_GT(orientation_deg, -90.01f);
108 DCHECK_LT(orientation_deg, 90.01f); 109 DCHECK_LT(orientation_deg, 90.01f);
109 if (orientation_deg >= 0) { 110 if (orientation_deg >= 0) {
110 // The case orientation_deg == 0 is handled here on purpose: although the 111 // The case orientation_deg == 0 is handled here on purpose: although the
111 // 'else' block is equivalent in this case, we want to pass the 0 value 112 // 'else' block is equivalent in this case, we want to pass the 0 value
112 // unchanged (and 0 is the default value for many devices that don't 113 // unchanged (and 0 is the default value for many devices that don't
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 } 295 }
295 296
296 WebGestureEvent CreateWebGestureEventFromGestureEventData( 297 WebGestureEvent CreateWebGestureEventFromGestureEventData(
297 const GestureEventData& data) { 298 const GestureEventData& data) {
298 return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(), 299 return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(),
299 gfx::PointF(data.x, data.y), 300 gfx::PointF(data.x, data.y),
300 gfx::PointF(data.raw_x, data.raw_y), data.flags); 301 gfx::PointF(data.raw_x, data.raw_y), data.flags);
301 } 302 }
302 303
303 } // namespace ui 304 } // namespace ui
OLDNEW
« no previous file with comments | « content/browser/renderer_host/input/web_input_event_util_unittest.cc ('k') | ui/events/gesture_detection/motion_event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698