Identity the mouse pointer type from low-level events for Mac

content/browser/renderer_host/render_widget_host_view_mac.mm

Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 384bc26e6c6ce9b9ad80bd1be324c28b90d3a594..5dadac98c25e457da2f9c6399fd0f3503c420dbf 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -1255,7 +1255,8 @@ void RenderWidgetHostViewMac::SetShowingContextMenu(bool showing) {
                                    eventNumber:0
                                     clickCount:0
                                       pressure:0];
-  WebMouseEvent web_event = WebMouseEventBuilder::Build(event, cocoa_view_);
+  WebMouseEvent web_event = WebMouseEventBuilder::Build(
+      event, cocoa_view_, blink::WebPointerProperties::PointerType::Mouse);
   if (showing)
     web_event.type = WebInputEvent::MouseLeave;
   ForwardMouseEvent(web_event);
@@ -1989,10 +1990,17 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
       return;
   }
 
+  // If the pointing device enters proximity of its tablet and does not leave,
+  // the pointer type should be pen, otherwise is mouse.

[Navid Zolghadr, 2016/05/31 04:18:12]

Just a quick question for clarification. Does this comment implies that we are
getting an event when the pen enters/leaves the range of the digitizer? What
event type do we send to Blink in that case?

[lanwei, 2016/05/31 14:33:35]

Even without actually touching the tablet screen, first a NSTabletProximity
event, then MouseEnter, MouseMove events which have a subtype of
NSTabletPointEventSubtype. MouseEnter and MouseExited do not have subtype.

[mustaq, 2016/05/31 14:43:50]

Navid: Blink gets move & leave respectively, defined in
web_input_event_builders_mac.mm. That means the w3c test
pointerevent_pointerleave_pen-manual should pass (before/after this CL,
depending on dependece on pointerType) for mac, right?

+  blink::WebPointerProperties::PointerType pointerType =
+      stylusEnteringProximity_

[dtapuska, 2016/05/31 13:31:05]

Can we not always just use the subtype?  It looks like you fill the type in
always except for mouse enter/exit.

Is it a problem with these events that mouse enter and exit don't have a
subtype?

Perhaps we should be listening to tabletPoint and tabletProximity events and
generate appropriate events.

[lanwei, 2016/05/31 14:33:35]

Sorry, I forgot to add the comment that MouseEnter and MouseExited do not have
subtype. "Some event types might have subtypes, ..." They mentioned this in the
doc I attached to this CL, and I tested, only MouseEnter and MouseExited do not
have subtype. I am not sure why they design this way. 

If all mouse events have subtypes then we can easily decide what are stylus
events, but now we have to use TabletProximity as well to decide the pointer
types for MouseEnter and MouseExited events.

I have not tried to listen to tabletPoint, " A pointer event is an NSEvent
object of type NSTabletPoint or an object representing a mouse-down,
mouse-dragged, or mouse-up event with a subtype of NSTabletPointEventSubtype."
Maybe for stylus, we should listen to both NSTabletPoint and mouse events?

[mustaq, 2016/05/31 14:43:50]

The following link seems to suggest that subtype is "valid for mouse events", so
MouseEnter & MouseExited not having this seems to contradict the spec. It would
be great to have a second stylus device, this cold be device or driver specific
problem.

https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Applica...

+          ? blink::WebPointerProperties::PointerType::Pen
+          : blink::WebPointerProperties::PointerType::Mouse;
   if ([self shouldIgnoreMouseEvent:theEvent]) {
     // If this is the first such event, send a mouse exit to the host view.
     if (!mouseEventWasIgnored_ && renderWidgetHostView_->render_widget_host_) {
-      WebMouseEvent exitEvent = WebMouseEventBuilder::Build(theEvent, self);
+      WebMouseEvent exitEvent =
+          WebMouseEventBuilder::Build(theEvent, self, pointerType);
       exitEvent.type = WebInputEvent::MouseLeave;
       exitEvent.button = WebMouseEvent::ButtonNone;
       renderWidgetHostView_->ForwardMouseEvent(exitEvent);
@@ -2005,7 +2013,8 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
     // If this is the first mouse event after a previous event that was ignored
     // due to the hitTest, send a mouse enter event to the host view.
     if (renderWidgetHostView_->render_widget_host_) {
-      WebMouseEvent enterEvent = WebMouseEventBuilder::Build(theEvent, self);
+      WebMouseEvent enterEvent =
+          WebMouseEventBuilder::Build(theEvent, self, pointerType);
       enterEvent.type = WebInputEvent::MouseMove;
       enterEvent.button = WebMouseEvent::ButtonNone;
       if (renderWidgetHostView_->ShouldRouteEvent(enterEvent)) {
@@ -2042,7 +2051,8 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
     [self confirmComposition];
   }
 
-  WebMouseEvent event = WebMouseEventBuilder::Build(theEvent, self);
+  WebMouseEvent event =
+      WebMouseEventBuilder::Build(theEvent, self, pointerType);
   if (renderWidgetHostView_->ShouldRouteEvent(event)) {
     renderWidgetHostView_->render_widget_host_->delegate()
         ->GetInputEventRouter()
@@ -2052,6 +2062,10 @@ void RenderWidgetHostViewMac::OnDisplayMetricsChanged(
   }
 }
 
+- (void)tabletEvent:(NSEvent*)theEvent {
+  stylusEnteringProximity_ = [theEvent isEnteringProximity];
+}
+
 - (BOOL)performKeyEquivalent:(NSEvent*)theEvent {
   // |performKeyEquivalent:| is sent to all views of a window, not only down the
   // responder chain (cf. "Handling Key Equivalents" in