Send pointerleave and pointerenter events for styluses on Mac

content/browser/renderer_host/input/web_input_event_builders_mac.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2006-2009 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 309 matching lines @@
     NOTIMPLEMENTED();
 
   result.timeStampSeconds = [event timestamp];
   result.isSystemKey = IsSystemKeyEvent(result);
 
   return result;
 }
 
 // WebMouseEvent --------------------------------------------------------------
 
-blink::WebMouseEvent WebMouseEventBuilder::Build(NSEvent* event, NSView* view) {
+blink::WebMouseEvent WebMouseEventBuilder::Build(
+    NSEvent* event,
+    NSView* view,
+    blink::WebPointerProperties::PointerType pointerType) {
   blink::WebMouseEvent result;
 
   result.clickCount = 0;
 
   NSEventType type = [event type];
   switch (type) {
     case NSMouseExited:
       result.type = blink::WebInputEvent::MouseLeave;
       result.button = blink::WebMouseEvent::Button::NoButton;
       break;
@@ skipping 46 matching lines @@
     default:
       NOTIMPLEMENTED();
   }
 
   SetWebEventLocationFromEventInView(&result, event, view);
 
   result.modifiers = ModifiersFromEvent(event);
 
   result.timeStampSeconds = [event timestamp];
 
-  // For NSMouseExited and NSMouseEntered, they do not have a subtype. Styluses
-  // and mouses share the same cursor, so we will set their pointerType as
-  // Unknown for now.
+  // For NSMouseExited and NSMouseEntered events, they do not have a subtype.
+  // We decide their pointer types by checking if we recevied a

[mustaq, 2016/10/14 16:07:16]

Please clarify that the check is done at the caller: "...by checking (at the
caller) if..."

+  // NSTabletProximity event.
   if (type == NSMouseExited || type == NSMouseEntered) {
-    result.pointerType = blink::WebPointerProperties::PointerType::Unknown;
+    result.pointerType = pointerType;
     return result;
   }
 
   // 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::Mouse;
     return result;
   }
 
   // Set stylus properties for events with a subtype of
   // NSTabletPointEventSubtype.

[mustaq, 2016/10/14 16:07:16]

This comment looks a bit stale: should say "a subtype of
NSTabletPointEventSubtype or NSTabletProximityEventSubtype", right?

   result.pointerType = blink::WebPointerProperties::PointerType::Pen;

[mustaq, 2016/10/14 16:07:16]

The pen must be in proximity in this case right?

   result.id = [event deviceID];
   if (subtype == NSTabletPointEventSubtype) {
     result.force = [event pressure];
     NSPoint tilt = [event tilt];
     result.tiltX = lround(tilt.x * 90);
     result.tiltY = lround(tilt.y * 90);
+  } else {
+    result.type = [event isEnteringProximity]
+                      ? blink::WebInputEvent::MouseMove
+                      : blink::WebInputEvent::MouseLeave;
   }
   return result;
 }
 
 // WebMouseWheelEvent ---------------------------------------------------------
 
 blink::WebMouseWheelEvent WebMouseWheelEventBuilder::Build(
     NSEvent* event,
     NSView* view) {
   blink::WebMouseWheelEvent result;
@@ skipping 182 matching lines @@
       break;
     default:
       NOTIMPLEMENTED();
       result.type = blink::WebInputEvent::Undefined;
   }
 
   return result;
 }
 
 }  // namespace content