Chromium Code Reviews| Index: content/browser/renderer_host/input/web_input_event_builders_mac.mm |
| diff --git a/content/browser/renderer_host/input/web_input_event_builders_mac.mm b/content/browser/renderer_host/input/web_input_event_builders_mac.mm |
| index d9cf15370d0d376278a578286087fb56a0d673a0..45c37416b0d02e754e0700ceaed613b8fbff8bc2 100644 |
| --- a/content/browser/renderer_host/input/web_input_event_builders_mac.mm |
| +++ b/content/browser/renderer_host/input/web_input_event_builders_mac.mm |
| @@ -405,17 +405,22 @@ blink::WebMouseEvent WebMouseEventBuilder::Build(NSEvent* event, NSView* view) { |
| // For other mouse events and touchpad events, the pointer type is mouse. |
| // For all other tablet events, the pointer type will be just pen. |
| NSEventSubtype subtype = [event subtype]; |
| - if (subtype == NSTabletPointEventSubtype || |
| - subtype == NSTabletProximityEventSubtype) { |
| - result.pointerType = blink::WebPointerProperties::PointerType::Pen; |
| - } else { |
| + if (subtype != NSTabletPointEventSubtype && |
| + subtype != NSTabletProximityEventSubtype) { |
| result.pointerType = blink::WebPointerProperties::PointerType::Mouse; |
| + return result; |
|
mustaq
2016/09/21 19:39:36
- Could you please confirm that uninitialized resu
lanwei
2016/09/21 20:13:42
Yes, default values of force is NaN, tiltx, y are
|
| } |
| + |
| + // Set stylus properties for events with a subtype of |
| + // NSTabletPointEventSubtype. |
| + result.pointerType = blink::WebPointerProperties::PointerType::Pen; |
| result.id = [event deviceID]; |
| - result.force = [event pressure]; |
| - NSPoint tilt = [event tilt]; |
| - result.tiltX = lround(tilt.x * 90); |
| - result.tiltY = lround(tilt.y * 90); |
| + if (subtype == NSTabletPointEventSubtype) { |
| + result.force = [event pressure]; |
| + NSPoint tilt = [event tilt]; |
| + result.tiltX = lround(tilt.x * 90); |
| + result.tiltY = lround(tilt.y * 90); |
| + } |
| return result; |
| } |