Attachment 372140 Details for Bug 198868 – Patch

[patch] Patch

bug-198868-20190614231347.patch (text/plain), 4.96 KB, created by Antoine Quint on 2019-06-14 14:13:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-06-14 14:13:48 PDT

Size: 4.96 KB

patch

obsolete

>Subversion Revision: 246429
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index db06abba2d7b5ba87a738ca1dd1d0f25dc0c3ef2..4b3443d68dd9974c7eb94635abf98ea280e99469 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        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-13  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WHLSL] Remove unnecessary ASSERT()s and clean up visitor lambdas
>diff --git a/Source/WebCore/page/PointerCaptureController.cpp b/Source/WebCore/page/PointerCaptureController.cpp
>index c50c38297a2d0146dd3ac96da1eb9db760fcf496..f822abdc11db2fd87cd605939e2c0204ffbf7fc7 100644
>--- a/Source/WebCore/page/PointerCaptureController.cpp
>+++ b/Source/WebCore/page/PointerCaptureController.cpp
>@@ -241,7 +241,7 @@ RefPtr<PointerEvent> PointerCaptureController::pointerEventForMouseEvent(const M
>     auto& capturingData = iterator->value;
> 
>     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
>     // Some pointer devices, such as mouse or pen, support multiple buttons. In the Mouse Event model, each button
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index a3cf51518e565fef1b8dd845ba07fa147c2e1c14..cf4ac98061a52ebbd7b67a7f1eaa9edcd0930bec 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+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 NOBODY (OOPS!).
>+
>+        * pointerevents/mouse/pointer-button-and-buttons-expected.txt: Added.
>+        * pointerevents/mouse/pointer-button-and-buttons.html: Added.
>+        * pointerevents/utils.js:
>+        (prototype._handlePointerEvent):
>+
> 2019-06-13  Antoine Quint  <graouts@apple.com>
> 
>         REGRESSION (r246103) [ Mojave+ WK1 ] Layout Test scrollbars/scrollbar-iframe-click-does-not-blur-content.html is timing out
>diff --git a/LayoutTests/pointerevents/mouse/pointer-button-and-buttons-expected.txt b/LayoutTests/pointerevents/mouse/pointer-button-and-buttons-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..931b97fb92bd138f6cbcec4cf4114b8f54ce0dea
>--- /dev/null
>+++ b/LayoutTests/pointerevents/mouse/pointer-button-and-buttons-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Testing that the "button" and "buttons" properties report the expected values. 
>+
>diff --git a/LayoutTests/pointerevents/mouse/pointer-button-and-buttons.html b/LayoutTests/pointerevents/mouse/pointer-button-and-buttons.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..fe836d2f48179d5777f786f0dc3fb2afdae8c296
>--- /dev/null
>+++ b/LayoutTests/pointerevents/mouse/pointer-button-and-buttons.html
>@@ -0,0 +1,31 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<meta charset=utf-8>
>+</head>
>+<body>
>+<script src="../../resources/testharness.js"></script>
>+<script src="../../resources/testharnessreport.js"></script>
>+<script src="../utils.js"></script>
>+<script>
>+
>+'use strict';
>+
>+target_test((target, test) => {
>+    const eventTracker = new EventTracker(target, ["pointerdown", "pointerup"]);
>+
>+    // Click without a move.
>+    eventSender.mouseMoveTo(50, 50);
>+    eventSender.mouseDown();
>+    eventSender.mouseUp();
>+
>+    eventTracker.assertMatchesEvents([
>+        { type : "pointerdown", x: 50, y: 50, button: 0, buttons: 1 },
>+        { type : "pointerup", x: 50, y: 50, button: 0, buttons: 0 },
>+    ]);
>+    test.done();
>+}, `Testing that the "button" and "buttons" properties report the expected values.`);
>+
>+</script>
>+</body>
>+</html>
>\ No newline at end of file
>diff --git a/LayoutTests/pointerevents/utils.js b/LayoutTests/pointerevents/utils.js
>index f2564e026b4b3862cdf308c94ed6574599b51924..48921966ba945f8fa5f3b574b9bada81ac4777df 100644
>--- a/LayoutTests/pointerevents/utils.js
>+++ b/LayoutTests/pointerevents/utils.js
>@@ -69,7 +69,9 @@ class EventTracker
>             y: event.clientY,
>             pressure: event.pressure,
>             isPrimary: event.isPrimary,
>-            isTrusted: event.isTrusted
>+            isTrusted: event.isTrusted,
>+            button: event.button,
>+            buttons: event.buttons
>         });
>     }
>

Flags:

dino: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 198868: 372140