Changeset 246445 in webkit

Timestamp:

Jun 14, 2019 2:17:02 PM (5 years ago)

Author:

graouts@webkit.org

Message:

[Pointer Events] button property is -1 for pointerdown and pointerup
​https://bugs.webkit.org/show_bug.cgi?id=198868
<rdar://problem/51758109>

Reviewed by Dean Jackson.

Source/WebCore:

A value of -1 for "button", which means there was no change of pressed button since the last event, should only ever be used for "pointermove" events.

Test: pointerevents/mouse/pointer-button-and-buttons.html

• page/PointerCaptureController.cpp:

(WebCore::PointerCaptureController::pointerEventForMouseEvent):

LayoutTests:

• pointerevents/mouse/pointer-button-and-buttons-expected.txt: Added.
• pointerevents/mouse/pointer-button-and-buttons.html: Added.
• pointerevents/utils.js:

(prototype._handlePointerEvent):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/pointerevents/mouse/pointer-button-and-buttons-expected.txt (added)
• LayoutTests/pointerevents/mouse/pointer-button-and-buttons.html (added)
• LayoutTests/pointerevents/utils.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/PointerCaptureController.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-06-14  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] button property is -1 for pointerdown and pointerup
+        https://bugs.webkit.org/show_bug.cgi?id=198868
+        <rdar://problem/51758109>
+
+        Reviewed by Dean Jackson.
+
+        * pointerevents/mouse/pointer-button-and-buttons-expected.txt: Added.
+        * pointerevents/mouse/pointer-button-and-buttons.html: Added.
+        * pointerevents/utils.js:
+        (prototype._handlePointerEvent):
+
 2019-06-14  John Wilander  <wilander@apple.com>
 

trunk/LayoutTests/pointerevents/utils.js

@@ -70 +70 @@
             pressure: event.pressure,
             isPrimary: event.isPrimary,
-            isTrusted: event.isTrusted
+            isTrusted: event.isTrusted,
+            button: event.button,
+            buttons: event.buttons
         });
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-14  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] button property is -1 for pointerdown and pointerup
+        https://bugs.webkit.org/show_bug.cgi?id=198868
+        <rdar://problem/51758109>
+
+        Reviewed by Dean Jackson.
+
+        A value of -1 for "button", which means there was no change of pressed button since the last event, should only ever be used for "pointermove" events.
+
+        Test: pointerevents/mouse/pointer-button-and-buttons.html
+
+        * page/PointerCaptureController.cpp:
+        (WebCore::PointerCaptureController::pointerEventForMouseEvent):
+
 2019-06-14  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/page/PointerCaptureController.cpp

@@ -242 +242 @@
 
     short newButton = mouseEvent.button();
-    short button = newButton == capturingData.previousMouseButton ? -1 : newButton;
+    short button = (type == names.mousemoveEvent && newButton == capturingData.previousMouseButton) ? -1 : newButton;
 
     // https://w3c.github.io/pointerevents/#chorded-button-interactions