OLD | NEW |
---|---|
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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 = event.GetOrientation(pointer_index) * 180.f / M_PI; |
103 DCHECK_GE(major_radius, 0); | 103 DCHECK_GE(major_radius, 0); |
104 DCHECK_GE(minor_radius, 0); | 104 DCHECK_GE(minor_radius, 0); |
105 DCHECK_GE(major_radius, minor_radius); | 105 DCHECK_GE(major_radius, minor_radius); |
106 // Orientation lies in [-90, 90] for a touch screen or pad and in [-180, 180] | |
107 // for a stylus. | |
106 // Allow a small bound tolerance to account for floating point conversion. | 108 // Allow a small bound tolerance to account for floating point conversion. |
107 DCHECK_GT(orientation_deg, -90.01f); | 109 DCHECK_GT(orientation_deg, -180.01f); |
jdduke (slow)
2015/05/28 15:01:45
I spoke offline with mustaq/tdresser. We decided i
USE eero AT chromium.org
2015/05/29 10:49:30
Done.
| |
108 DCHECK_LT(orientation_deg, 90.01f); | 110 DCHECK_LT(orientation_deg, 180.01f); |
111 if (orientation_deg >= 90.f) | |
jdduke (slow)
2015/05/28 15:01:45
Let's make this a strict inequality (>, <).
USE eero AT chromium.org
2015/05/29 10:49:30
Actually, this one should not be a strict inequali
| |
112 orientation_deg -= 180.f; | |
113 if (orientation_deg <= -90.f) | |
USE eero AT chromium.org
2015/05/29 10:49:30
But this should be a strict inequality.
Done.
| |
114 orientation_deg += 180.f; | |
109 if (orientation_deg >= 0) { | 115 if (orientation_deg >= 0) { |
110 // The case orientation_deg == 0 is handled here on purpose: although the | 116 // 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 | 117 // '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 | 118 // unchanged (and 0 is the default value for many devices that don't |
113 // report elliptical touches). | 119 // report elliptical touches). |
114 touch.radiusX = minor_radius; | 120 touch.radiusX = minor_radius; |
115 touch.radiusY = major_radius; | 121 touch.radiusY = major_radius; |
116 touch.rotationAngle = orientation_deg; | 122 touch.rotationAngle = orientation_deg; |
117 } else { | 123 } else { |
118 touch.radiusX = major_radius; | 124 touch.radiusX = major_radius; |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
294 } | 300 } |
295 | 301 |
296 WebGestureEvent CreateWebGestureEventFromGestureEventData( | 302 WebGestureEvent CreateWebGestureEventFromGestureEventData( |
297 const GestureEventData& data) { | 303 const GestureEventData& data) { |
298 return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(), | 304 return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(), |
299 gfx::PointF(data.x, data.y), | 305 gfx::PointF(data.x, data.y), |
300 gfx::PointF(data.raw_x, data.raw_y), data.flags); | 306 gfx::PointF(data.raw_x, data.raw_y), data.flags); |
301 } | 307 } |
302 | 308 |
303 } // namespace ui | 309 } // namespace ui |
OLD | NEW |