Changeset 167778 in webkit

Timestamp:

Apr 24, 2014, 3:24:41 PM (12 years ago)

Author:

matthew_hanson@apple.com

Message:

Rollout r167689.

Location:

tags/Safari-538.31

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/shadow-event-path-expected.txt (deleted)
• LayoutTests/fast/events/shadow-event-path.html (deleted)
• LayoutTests/platform/mac-wk2/fast/events/shadow-event-path-expected.txt (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/EventDispatcher.cpp (modified) (5 diffs)

tags/Safari-538.31/LayoutTests/ChangeLog

@@ -165 +165 @@
         ensure that they are explicitly different colors.
         * fast/css/padding-margin-negative-border.html:
-
-2014-04-22  Ryosuke Niwa  <rniwa@webkit.org>
-
-        REGRESSION (r157328): popover to check into flight ba.com dismisses instantly when focusing form
-        https://bugs.webkit.org/show_bug.cgi?id=131949
-
-        Reviewed by Darin Adler.
-
-        Add a test that dumps the event target and the related target of every mouse event
-        when dispatched inside an input element inside a details element.
-
-        This catches the regression as well as other bugs I encountered while fixing the bug.
-
-        We need a WK2 specific results because WK1 mac results contain an extra fake mouse move event.
-
-        * fast/events/shadow-event-path-expected.txt: Added.
-        * fast/events/shadow-event-path.html: Added.
-        * platform/mac-wk2/fast/events/shadow-event-expected.txt: Added.
 
 2014-04-22  Ryosuke Niwa  <rniwa@webkit.org>

tags/Safari-538.31/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Rollout r167689.
+
+    2014-04-22  Ryosuke Niwa  <rniwa@webkit.org>
+
+            Rollout r156635 since the old behavior was intentional.
+
+            * page/EventHandler.cpp:
+            (WebCore::EventHandler::selectCursor):
+
 2014-04-23  Benjamin Poulain  <bpoulain@apple.com>
 

tags/Safari-538.31/Source/WebCore/dom/EventDispatcher.cpp

@@ -91 +91 @@
     void updateTouchLists(const TouchEvent&);
 #endif
-    void setRelatedTarget(Node& origin, EventTarget&);
+    void setRelatedTarget(EventTarget&);
 
     bool hasEventListeners(const AtomicString& eventType) const;
@@ -149 +149 @@
         }
 
-        if (&newTreeScope == &m_relatedNodeTreeScope)
-            m_relatedNodeInCurrentTreeScope = &m_relatedNode;
-        else if (m_relatedNodeInCurrentTreeScope) {
+        if (m_relatedNodeInCurrentTreeScope) { // relatedNode is under the current tree scope
             ASSERT(m_currentTreeScope);
             m_relatedNodeInCurrentTreeScope = &newTarget;
-        } else {
-            if (!m_currentTreeScope) {
-                TreeScope* newTreeScopeAncestor = &newTreeScope;
-                do {
-                    m_relatedNodeInCurrentTreeScope = findHostOfTreeScopeInTargetTreeScope(m_relatedNodeTreeScope, *newTreeScopeAncestor);
-                    newTreeScopeAncestor = newTreeScopeAncestor->parentTreeScope();
-                    if (newTreeScopeAncestor == &m_relatedNodeTreeScope) {
-                        m_relatedNodeInCurrentTreeScope = &m_relatedNode;
-                        break;
-                    }
-                } while (newTreeScopeAncestor && !m_relatedNodeInCurrentTreeScope);
-            }
-            ASSERT(m_relatedNodeInCurrentTreeScope || findHostOfTreeScopeInTargetTreeScope(newTreeScope, m_relatedNodeTreeScope)
-                || &newTreeScope.documentScope() != &m_relatedNodeTreeScope.documentScope());
-        }
+        } else if (&newTreeScope == &m_relatedNodeTreeScope) // relatedNode is in the current tree scope;
+            m_relatedNodeInCurrentTreeScope = &m_relatedNode;
+        // Otherwise, we haven't reached the tree scope that contains relatedNode yet.
 
         m_currentTreeScope = &newTreeScope;
 
         return m_relatedNodeInCurrentTreeScope;
-    }
-
-    static Node* findHostOfTreeScopeInTargetTreeScope(const TreeScope& startingTreeScope, const TreeScope& targetScope)
-    {
-        ASSERT(&targetScope != &startingTreeScope);
-        Node* previousHost = 0;
-        for (const TreeScope* scope = &startingTreeScope; scope; scope = scope->parentTreeScope()) {
-            if (scope == &targetScope) {
-                ASSERT(previousHost);
-                ASSERT_WITH_SECURITY_IMPLICATION(&previousHost->treeScope() == &targetScope);
-                return previousHost;
-            }
-            if (scope->rootNode().isShadowRoot())
-                previousHost = toShadowRoot(scope->rootNode()).hostElement();
-            else
-                ASSERT_WITH_SECURITY_IMPLICATION(!scope->parentTreeScope());
-        }
-        return 0;
     }
 
@@ -338 +306 @@
 
     if (EventTarget* relatedTarget = event->relatedTarget())
-        eventPath.setRelatedTarget(*node, *relatedTarget);
+        eventPath.setRelatedTarget(*relatedTarget);
 #if ENABLE(TOUCH_EVENTS) && !PLATFORM(IOS)
     if (event->isTouchEvent())
@@ -485 +453 @@
 #endif
 
-void EventPath::setRelatedTarget(Node& origin, EventTarget& relatedTarget)
+void EventPath::setRelatedTarget(EventTarget& relatedTarget)
 {
     Node* relatedNode = relatedTarget.toNode();
@@ -493 +461 @@
     EventRelatedNodeResolver resolver(*relatedNode);
 
-    bool originIsRelatedTarget = &origin == relatedNode;
-    Node& rootNodeInOriginTreeScope = origin.treeScope().rootNode();
-
     size_t eventPathSize = m_path.size();
-    size_t i = 0;
-    while (i < eventPathSize) {
-        Node* contextNode = m_path[i]->node();
-        Node* currentRelatedNode = resolver.moveToParentOrShadowHost(*contextNode);
-        if (!originIsRelatedTarget && m_path[i]->target() == currentRelatedNode)
-            break;
-        toMouseOrFocusEventContext(*m_path[i]).setRelatedTarget(currentRelatedNode);
-        i++;
-        if (originIsRelatedTarget && &rootNodeInOriginTreeScope == contextNode)
-            break;
-    }
-    m_path.shrink(i);
+    for (size_t i = 0; i < eventPathSize; i++)
+        toMouseOrFocusEventContext(*m_path[i]).setRelatedTarget(resolver.moveToParentOrShadowHost(*m_path[i]->node()));
 }