Attachment 370504 Details for Bug 198177 – Patch

[patch] Patch

bug-198177-20190523152524.patch (text/plain), 7.70 KB, created by Antoine Quint on 2019-05-23 06:25:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-05-23 06:25:25 PDT

Size: 7.70 KB

patch

obsolete

>Subversion Revision: 245679
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a17fe395da205d1decb0f28a541aaf411e8cf03d..2fcf16d63f0654b1b9377bb559647ee177ff408d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-23  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] The mouseover, mouseout, mouseenter, and mouseleave events should not be prevented while the pointer is down
>+        https://bugs.webkit.org/show_bug.cgi?id=198177
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html
>+
>+        The Pointer Event spec, in https://www.w3.org/TR/pointerevents/#compatibility-mapping-with-mouse-events, says that "the mouseover,
>+        mouseout, mouseenter, and mouseleave events are never prevented (even if the pointer is down)." We add a new static function which
>+        indicates what is "compatibility" mouse event since those should be excluded, along with "click", which we already excluded.
>+
>+        * dom/Element.cpp:
>+        (WebCore::isCompatibilityMouseEvent):
>+        (WebCore::Element::dispatchMouseEvent):
>+
> 2019-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         font-optical-sizing applies the wrong variation value
>diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
>index 77ba33ba9777adefd2b4fd8734b82f2e8f23139b..d0b45009ef1b0709561af935b7c0c25fe8967180 100644
>--- a/Source/WebCore/dom/Element.cpp
>+++ b/Source/WebCore/dom/Element.cpp
>@@ -288,6 +288,13 @@ static bool isForceEvent(const PlatformMouseEvent& platformEvent)
>     return platformEvent.type() == PlatformEvent::MouseForceChanged || platformEvent.type() == PlatformEvent::MouseForceDown || platformEvent.type() == PlatformEvent::MouseForceUp;
> }
> 
>+static bool isCompatibilityMouseEvent(const MouseEvent& mouseEvent)
>+{
>+    // https://www.w3.org/TR/pointerevents/#compatibility-mapping-with-mouse-events
>+    const auto& type = mouseEvent.type();
>+    return type != eventNames().clickEvent && type != eventNames().mouseoverEvent && type != eventNames().mouseoutEvent && type != eventNames().mouseenterEvent && type != eventNames().mouseleaveEvent;
>+}
>+
> bool Element::dispatchMouseEvent(const PlatformMouseEvent& platformEvent, const AtomicString& eventType, int detail, Element* relatedTarget)
> {
>     if (isDisabledFormControl())
>@@ -314,7 +321,7 @@ bool Element::dispatchMouseEvent(const PlatformMouseEvent& platformEvent, const
>         if (auto pointerEvent = PointerEvent::create(mouseEvent)) {
>             if (auto* page = document().page()) {
>                 page->pointerCaptureController().dispatchEvent(*pointerEvent, this);
>-                if (mouseEvent->type() != eventNames().clickEvent && page->pointerCaptureController().preventsCompatibilityMouseEventsForIdentifier(pointerEvent->pointerId()))
>+                if (isCompatibilityMouseEvent(mouseEvent) && page->pointerCaptureController().preventsCompatibilityMouseEventsForIdentifier(pointerEvent->pointerId()))
>                     return false;
>             }
>             if (pointerEvent->defaultPrevented() || pointerEvent->defaultHandled()) {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 47453ae318256f230dadef3e0ecfe9e78400d930..dc5f4b4c71a516896b6c36d5f7b361612104117d 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-23  Antoine Quint  <graouts@apple.com>
>+
>+        [Pointer Events] The mouseover, mouseout, mouseenter, and mouseleave events should not be prevented while the pointer is down
>+        https://bugs.webkit.org/show_bug.cgi?id=198177
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a test that listens to all mouse events and checks which are dispatched in the case preventDefault() is called when handling
>+        "pointerdown" and when it isn't.
>+
>+        * platform/mac-wk1/TestExpectations: Skipping the test on WK1 where the sequence of dispatched mouse events does not match.
>+        * pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed-expected.txt: Added.
>+        * pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html: Added.
>+
> 2019-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         font-optical-sizing applies the wrong variation value
>diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index ae05f8a8a9d868e301d6e5550de3f4ea2f48f96e..57d2c830875c20e0a0b11777ca6971e5f76f369a 100644
>--- a/LayoutTests/platform/mac-wk1/TestExpectations
>+++ b/LayoutTests/platform/mac-wk1/TestExpectations
>@@ -699,3 +699,5 @@ webkit.org/b/196915 [ Debug ] inspector/timeline/timeline-recording.html [ Pass
> 
> webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Skip ]
> webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource-iframe.html [ Skip ]
>+
>+webkit.org/b/198177 pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html [ Skip ]
>diff --git a/LayoutTests/pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed-expected.txt b/LayoutTests/pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f2587a7f11a695b03565a87216bd20af233a027e
>--- /dev/null
>+++ b/LayoutTests/pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed-expected.txt
>@@ -0,0 +1,3 @@
>+
>+PASS Testing that calling preventDefault() when handling a "pointerdown" event only blocks expected events. 
>+
>diff --git a/LayoutTests/pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html b/LayoutTests/pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..9e4a992afb023d209a2e5eef9e59fb491bd103c0
>--- /dev/null
>+++ b/LayoutTests/pointerevents/mouse/compatibility-mouse-events-prevention-mouse-pressed.html
>@@ -0,0 +1,59 @@
>+<!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';
>+
>+function runMouseSequence()
>+{
>+    eventSender.mouseDown();
>+    eventSender.mouseMoveTo(25, 25);
>+    eventSender.mouseMoveTo(75, 75);
>+    eventSender.mouseUp();
>+}
>+
>+target_test({ x: "50px", y: "50px", width: "100px", height: "100px" }, (target, test) => {
>+    const eventTracker = new EventTracker(target, ["mousedown", "mouseover", "mouseenter", "mousemove", "mouseout", "mouseleave", "mouseup"]);
>+
>+    // First, move the mouse over the element to start in that state.
>+    eventSender.mouseMoveTo(75, 75);
>+    eventTracker.clear();
>+    
>+    // Then, press the mouse, don't call preventDefault() while handling "pointerdown", move the mouse out, then back over and finally release.
>+    runMouseSequence();
>+
>+    eventTracker.assertMatchesEvents([
>+        {"type": "mousedown" },
>+        {"type": "mouseout" },
>+        {"type": "mouseleave" },
>+        {"type": "mouseover" },
>+        {"type": "mouseenter" },
>+        {"type": "mousemove" },
>+        {"type": "mouseup" }
>+    ]);
>+
>+    eventTracker.clear();
>+
>+    // Then do the same thing but calling preventDefault() while handling "pointerdown".
>+    target.addEventListener("pointerdown", event => event.preventDefault());
>+    runMouseSequence();
>+
>+    eventTracker.assertMatchesEvents([
>+        {"type": "mouseout" },
>+        {"type": "mouseleave" },
>+        {"type": "mouseover" },
>+        {"type": "mouseenter" },
>+    ]);
>+    test.done();
>+}, `Testing that calling preventDefault() when handling a "pointerdown" event only blocks expected events.`);
>+
>+</script>
>+</body>
>+</html>
>\ No newline at end of file

Actions: View | Formatted Diff | Diff

Attachments on bug 198177: 370500 | 370503 | 370504