Identity the mouse pointer type from low-level events for 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 645 matching lines @@
                     encoding:NSASCIIStringEncoding];
 
   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) {

[mustaq, 2016/06/02 15:39:12]

Please rename the |pointerType| param to |pointerTypeForEnterLeave| to make it
clear that this is used in a special case. Then move the comment on Line 736 to
above this function.

[lanwei, 2016/06/03 14:13:15]

Done.

   blink::WebMouseEvent result;
 
   result.clickCount = 0;
 
-  switch ([event type]) {
+  NSEventType type = [event type];
+  switch (type) {
     case NSMouseExited:
       result.type = blink::WebInputEvent::MouseLeave;
       result.button = blink::WebMouseEvent::ButtonNone;
       break;
     case NSLeftMouseDown:
       result.type = blink::WebInputEvent::MouseDown;
       result.clickCount = [event clickCount];
       result.button = blink::WebMouseEvent::ButtonLeft;
       break;
     case NSOtherMouseDown:
@@ skipping 40 matching lines @@
     default:
       NOTIMPLEMENTED();
   }
 
   SetWebEventLocationFromEventInView(&result, event, view);
 
   result.modifiers = ModifiersFromEvent(event);
 
   result.timeStampSeconds = [event timestamp];
 
+  // Currently, NSMouseExited and NSMouseEntered do not have the 'subtype' and
+  // 'deviceID' properties.
+  // This is a simple solution which works only for a single input device.
+  if (type == NSMouseExited || type == NSMouseEntered) {
+    // Set the pointerType based on if there is a stylus in the proximity of
+    // the tablet
+    result.pointerType = pointerType;
+    return result;
+  }
+
+  // For the mouse events and the touchpad events, the pointer type is mouse.
+  // For all 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 {
+    result.pointerType = blink::WebPointerProperties::PointerType::Mouse;
+  }
+  result.id = [event deviceID];
+  result.force = [event pressure];
   return result;
 }
 
 // WebMouseWheelEvent ---------------------------------------------------------
 
 blink::WebMouseWheelEvent WebMouseWheelEventBuilder::Build(
     NSEvent* event,
     NSView* view,
     bool can_rubberband_left,
     bool can_rubberband_right) {
@@ skipping 189 matching lines @@
       break;
     default:
       NOTIMPLEMENTED();
       result.type = blink::WebInputEvent::Undefined;
   }
 
   return result;
 }
 
 }  // namespace content