Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1327)

Unified Diff: content/browser/renderer_host/input/web_input_event_builders_mac.mm

Issue 2373733002: Send pointerleave and pointerenter events for styluses on Mac (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 11f434f7548f98d3bfb1ae1394551185e9a93fc9..383e02c52f432cdd86e9eab44a10b7c83adccc3f 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
@@ -252,7 +252,10 @@ blink::WebKeyboardEvent WebKeyboardEventBuilder::Build(NSEvent* event) {
// WebMouseEvent --------------------------------------------------------------
-blink::WebMouseEvent WebMouseEventBuilder::Build(NSEvent* event, NSView* view) {
+blink::WebMouseEvent WebMouseEventBuilder::Build(
+ NSEvent* event,
+ NSView* view,
+ blink::WebPointerProperties::PointerType pointerType) {
blink::WebInputEvent::Type event_type = blink::WebInputEvent::Type::Undefined;
int click_count = 0;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::NoButton;
@@ -318,11 +321,11 @@ blink::WebMouseEvent WebMouseEventBuilder::Build(NSEvent* event, NSView* view) {
result.button = button;
SetWebEventLocationFromEventInView(&result, event, view);
- // 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
+ // NSTabletProximity event.
if (type == NSMouseExited || type == NSMouseEntered) {
- result.pointerType = blink::WebPointerProperties::PointerType::Unknown;
+ result.pointerType = pointerType;
return result;
}
@@ -352,6 +355,11 @@ blink::WebMouseEvent WebMouseEventBuilder::Build(NSEvent* event, NSView* view) {
if (twist < 0)
twist += 360;
result.twist = twist;
+ } else {
+ event_type = [event isEnteringProximity]
+ ? blink::WebInputEvent::MouseMove
+ : blink::WebInputEvent::MouseLeave;
+ result.setType(event_type);
}
return result;
}

Powered by Google App Engine
This is Rietveld 408576698