Changeset 245286 in webkit

Timestamp:

May 14, 2019 9:50:37 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[Pointer Events] The pointerenter and pointerleave events target the wrong element on iOS
​https://bugs.webkit.org/show_bug.cgi?id=197881
<rdar://problem/50187657>

Patch by Antoine Quint <Antoine Quint> on 2019-05-14
Reviewed by Dean Jackson.

Source/WebCore:

Test: pointerevents/ios/enter-leave-target.html

The "pointerenter" and "pointerleave" should target the element on which the event listener was added and not
the element that would otherwise hit test. This matches the behavior of "mouseenter" and "mouseleave" on macOS.

• page/PointerCaptureController.cpp:

(WebCore::PointerCaptureController::dispatchEventForTouchAtIndex):

LayoutTests:

Add a test where we tap an element that is the child of another element where the parent is the element with the "pointerenter"
and "pointerleave" events registered. The test shows that we correctly set the target to the parent element and not the child.

• pointerevents/ios/enter-leave-target-expected.txt: Added.
• pointerevents/ios/enter-leave-target.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/pointerevents/ios/enter-leave-target-expected.txt (added)
• LayoutTests/pointerevents/ios/enter-leave-target.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/PointerCaptureController.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-14  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] The pointerenter and pointerleave events target the wrong element on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=197881
+        <rdar://problem/50187657>
+
+        Reviewed by Dean Jackson.
+
+        Add a test where we tap an element that is the child of another element where the parent is the element with the "pointerenter"
+        and "pointerleave" events registered. The test shows that we correctly set the target to the parent element and not the child.
+
+        * pointerevents/ios/enter-leave-target-expected.txt: Added.
+        * pointerevents/ios/enter-leave-target.html: Added.
+
 2019-05-14  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-14  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] The pointerenter and pointerleave events target the wrong element on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=197881
+        <rdar://problem/50187657>
+
+        Reviewed by Dean Jackson.
+
+        Test: pointerevents/ios/enter-leave-target.html
+
+        The "pointerenter" and "pointerleave" should target the element on which the event listener was added and not
+        the element that would otherwise hit test. This matches the behavior of "mouseenter" and "mouseleave" on macOS.
+
+        * page/PointerCaptureController.cpp:
+        (WebCore::PointerCaptureController::dispatchEventForTouchAtIndex):
+
 2019-05-14  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/page/PointerCaptureController.cpp

@@ -165 +165 @@
     };
 
+    auto dispatchEnterOrLeaveEvent = [&](const String& type) {
+        if (!is<Element>(&target))
+            return;
+
+        auto* targetElement = &downcast<Element>(target);
+
+        bool hasCapturingListenerInHierarchy = false;
+        for (ContainerNode* curr = targetElement; curr; curr = curr->parentInComposedTree()) {
+            if (curr->hasCapturingEventListeners(type)) {
+                hasCapturingListenerInHierarchy = true;
+                break;
+            }
+        }
+
+        for (Element* element = &downcast<Element>(target); element; element = element->parentElementInComposedTree()) {
+            if (hasCapturingListenerInHierarchy || element->hasEventListeners(type))
+                element->dispatchEvent(PointerEvent::create(type, platformTouchEvent, index, isPrimary, view));
+        }
+    };
+
     auto pointerEvent = PointerEvent::create(platformTouchEvent, index, isPrimary, view);
 
@@ -172 +192 @@
         // pointerenter prior to dispatching the pointerdown event.
         dispatchEvent(eventNames().pointeroverEvent);
-        dispatchEvent(eventNames().pointerenterEvent);
+        dispatchEnterOrLeaveEvent(eventNames().pointerenterEvent);
     }
 
@@ -184 +204 @@
         // pointer event named pointerleave after dispatching the pointerup event.
         dispatchEvent(eventNames().pointeroutEvent);
-        dispatchEvent(eventNames().pointerleaveEvent);
+        dispatchEnterOrLeaveEvent(eventNames().pointerleaveEvent);
     }
 }