Changeset 200851 in webkit

Timestamp:

May 13, 2016, 6:26:37 AM (9 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r200414 - Clicks inside button elements are sometimes discarded when the mouse moves
​https://bugs.webkit.org/show_bug.cgi?id=39620

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/events/click-over-descendant-elements.html

• dom/Node.cpp:

(WebCore::ancestor):
(WebCore::commonAncestor): Method inspired from
​http://src.chromium.org/viewvc/blink?view=revision&revision=162081.
(WebCore::commonAncestorCrossingShadowBoundary): Helper routine
that handles the case of nodes into a shadow node.

• dom/Node.h:
• page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseReleaseEvent): Selecting click event
target node according commonAncestorOverShadowBoundary method.
(WebCore::EventHandler::targetNodeForClickEvent): Deleted.

LayoutTests:

Test coming from ​http://src.chromium.org/viewvc/blink?view=revision&revision=162081.
Modified to ensure click events do not end up being considered as double click events.

• fast/events/click-over-descendant-elements-expected.txt: Added.
• fast/events/click-over-descendant-elements.html: Added.
• platform/ios-simulator/TestExpectations: Marked new test as failing.

Location:

releases/WebKitGTK/webkit-2.12

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/click-over-descendant-elements-expected.txt (added)
• LayoutTests/fast/events/click-over-descendant-elements.html (added)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (1 diff)
• Source/WebCore/page/EventHandler.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        Clicks inside button elements are sometimes discarded when the mouse moves
+        https://bugs.webkit.org/show_bug.cgi?id=39620
+
+        Reviewed by Darin Adler.
+
+        Test coming from http://src.chromium.org/viewvc/blink?view=revision&revision=162081.
+        Modified to ensure click events do not end up being considered as double click events.
+
+        * fast/events/click-over-descendant-elements-expected.txt: Added.
+        * fast/events/click-over-descendant-elements.html: Added.
+        * platform/ios-simulator/TestExpectations: Marked new test as failing.
+
 2016-04-29  Alex Christensen  <achristensen@webkit.org>
 

releases/WebKitGTK/webkit-2.12/LayoutTests/platform/ios-simulator/TestExpectations

@@ -1641 +1641 @@
 fast/events/tab-focus-link-in-canvas.html [ Failure ]
 fast/events/tabindex-focus-blur-all.html [ Failure ]
+fast/events/click-over-descendant-elements.html [ Failure ]
 
 # Ref-test imported from W3C that is failing because type=image input elements have rounded corners on iOS.

releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-04  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        Clicks inside button elements are sometimes discarded when the mouse moves
+        https://bugs.webkit.org/show_bug.cgi?id=39620
+
+        Reviewed by Darin Adler.
+
+        Test: fast/events/click-over-descendant-elements.html
+
+        * dom/Node.cpp:
+        (WebCore::ancestor):
+        (WebCore::commonAncestor): Method inspired from
+        http://src.chromium.org/viewvc/blink?view=revision&revision=162081.
+        (WebCore::commonAncestorCrossingShadowBoundary): Helper routine
+        that handles the case of nodes into a shadow node.
+        * dom/Node.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseReleaseEvent): Selecting click event
+        target node according commonAncestorOverShadowBoundary method.
+        (WebCore::EventHandler::targetNodeForClickEvent): Deleted.
+
 2016-05-04  Jiewen Tan  <jiewen_tan@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.cpp

@@ -939 +939 @@
 }
 
+static inline Node* ancestor(Node* node, unsigned depth)
+{
+    for (unsigned i = 0; i < depth; ++i)
+        node = node->parentNode();
+    return node;
+}
+
+Node* commonAncestor(Node& thisNode, Node& otherNode)
+{
+    unsigned thisDepth = 0;
+    for (auto node = &thisNode; node; node = node->parentNode()) {
+        if (node == &otherNode)
+            return node;
+        thisDepth++;
+    }
+    unsigned otherDepth = 0;
+    for (auto node = &otherNode; node; node = node->parentNode()) {
+        if (node == &thisNode)
+            return &thisNode;
+        otherDepth++;
+    }
+
+    Node* thisAncestor = &thisNode;
+    Node* otherAncestor = &otherNode;
+    if (thisDepth > otherDepth)
+        thisAncestor = ancestor(thisAncestor, thisDepth - otherDepth);
+    else if (otherDepth > thisDepth)
+        otherAncestor = ancestor(otherAncestor, otherDepth - thisDepth);
+
+    for (; thisAncestor; thisAncestor = thisAncestor->parentNode()) {
+        if (thisAncestor == otherAncestor)
+            return thisAncestor;
+        otherAncestor = otherAncestor->parentNode();
+    }
+    ASSERT(!otherAncestor);
+    return nullptr;
+}
+
+Node* commonAncestorCrossingShadowBoundary(Node& node, Node& other)
+{
+    if (&node == &other)
+        return &node;
+
+    Element* shadowHost = node.shadowHost();
+    // FIXME: This test might be wrong for user-authored shadow trees.
+    if (shadowHost && shadowHost == other.shadowHost())
+        return shadowHost;
+
+    TreeScope* scope = commonTreeScope(&node, &other);
+    if (!scope)
+        return nullptr;
+
+    Node* parentNode = scope->ancestorInThisScope(&node);
+    ASSERT(parentNode);
+    Node* parentOther = scope->ancestorInThisScope(&other);
+    ASSERT(parentOther);
+    return commonAncestor(*parentNode, *parentOther);
+}
+
 Node* Node::pseudoAwarePreviousSibling() const
 {

releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.h

@@ -791 +791 @@
 }
 
+Node* commonAncestor(Node&, Node&);
+Node* commonAncestorCrossingShadowBoundary(Node&, Node&);
+
 } // namespace WebCore
 

releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp

@@ -1947 +1947 @@
 }
 
-static Node* targetNodeForClickEvent(Node* mousePressNode, Node* mouseReleaseNode)
-{
-    if (!mousePressNode || !mouseReleaseNode)
-        return nullptr;
-
-    if (mousePressNode == mouseReleaseNode)
-        return mouseReleaseNode;
-
-    Element* mouseReleaseShadowHost = mouseReleaseNode->shadowHost();
-    if (mouseReleaseShadowHost && mouseReleaseShadowHost == mousePressNode->shadowHost()) {
-        // We want to dispatch the click to the shadow tree host element to give listeners the illusion that the
-        // shadom tree is a single element. For example, we want to give the illusion that <input type="range">
-        // is a single element even though it is a composition of multiple shadom tree elements.
-        return mouseReleaseShadowHost;
-    }
-    return nullptr;
-}
-
 bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& platformMouseEvent)
 {
@@ -2026 +2008 @@
     bool contextMenuEvent = platformMouseEvent.button() == RightButton;
 
-    Node* nodeToClick = targetNodeForClickEvent(m_clickNode.get(), mouseEvent.targetNode());
+    Node* targetNode = mouseEvent.targetNode();
+    Node* nodeToClick = (m_clickNode && targetNode) ? commonAncestorCrossingShadowBoundary(*m_clickNode, *targetNode) : nullptr;
     bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent && nodeToClick && !dispatchMouseEvent(eventNames().clickEvent, nodeToClick, true, m_clickCount, platformMouseEvent, true);