Changeset 201292 in webkit

Timestamp:

May 23, 2016 1:25:03 PM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r200414.

This change appears to have broken the 'write a reply' field
on Nextdoor.com

Reverted changeset:

"Clicks inside button elements are sometimes discarded when
the mouse moves"
​https://bugs.webkit.org/show_bug.cgi?id=39620
​http://trac.webkit.org/changeset/200414

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/click-over-descendant-elements-expected.txt (deleted)
• LayoutTests/fast/events/click-over-descendant-elements.html (deleted)
• 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)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-23  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r200414.
+
+        This change appears to have broken the 'write a reply' field
+        on Nextdoor.com
+
+        Reverted changeset:
+
+        "Clicks inside button elements are sometimes discarded when
+        the mouse moves"
+        https://bugs.webkit.org/show_bug.cgi?id=39620
+        http://trac.webkit.org/changeset/200414
+
 2016-05-23  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/ios-simulator/TestExpectations

@@ -1655 +1655 @@
 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.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-23  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r200414.
+
+        This change appears to have broken the 'write a reply' field
+        on Nextdoor.com
+
+        Reverted changeset:
+
+        "Clicks inside button elements are sometimes discarded when
+        the mouse moves"
+        https://bugs.webkit.org/show_bug.cgi?id=39620
+        http://trac.webkit.org/changeset/200414
+
 2016-05-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -938 +938 @@
 }
 
-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
 {

trunk/Source/WebCore/dom/Node.h

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

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1956 +1956 @@
 }
 
+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)
 {
@@ -2017 +2035 @@
     bool contextMenuEvent = platformMouseEvent.button() == RightButton;
 
-    Node* targetNode = mouseEvent.targetNode();
-    Node* nodeToClick = (m_clickNode && targetNode) ? commonAncestorCrossingShadowBoundary(*m_clickNode, *targetNode) : nullptr;
+    Node* nodeToClick = targetNodeForClickEvent(m_clickNode.get(), mouseEvent.targetNode());
     bool swallowClickEvent = m_clickCount > 0 && !contextMenuEvent && nodeToClick && !dispatchMouseEvent(eventNames().clickEvent, nodeToClick, true, m_clickCount, platformMouseEvent, true);