Changeset 156390 in webkit

Timestamp:

Sep 25, 2013 6:02:20 AM (11 years ago)

Author:

akling@apple.com

Message:

Remove EventPathWalker.
<​https://webkit.org/b/121890>

Reviewed by Antti Koivisto.

Purge some more leftover Shadow DOM code.

• dom/EventPathWalker.cpp:
• dom/EventPathWalker.h:

Removed.

• dom/EventRetargeter.cpp:

(WebCore::nodeOrHostIfPseudoElement):
(WebCore::EventRetargeter::calculateEventPath):
(WebCore::EventRetargeter::buildRelatedNodeMap):

If starting at a pseudo element, e.g for events originating from
a transition on :before/:after, retarget to the pseudo element's
host as appropriate. This was the only real "feature" we were
using in EventPathWalker.

• page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseDraggedEvent):
(WebCore::EventHandler::updateDragAndDrop):
(WebCore::EventHandler::updateMouseEventTargetNode):
(WebCore::EventHandler::handleWheelEvent):
(WebCore::EventHandler::handleTouchEvent):

Replace use of EventPathWalker with parentOrShadowHostElement()
parent chain climbing.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• Target.pri (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• dom/DOMAllInOne.cpp (modified) (1 diff)
• dom/EventDispatcher.cpp (modified) (1 diff)
• dom/EventPathWalker.cpp (deleted)
• dom/EventPathWalker.h (deleted)
• dom/EventRetargeter.cpp (modified) (4 diffs)
• html/HTMLLIElement.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (6 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -1169 +1169 @@
     dom/EventListenerMap.cpp
     dom/EventNames.cpp
-    dom/EventPathWalker.cpp
     dom/EventRetargeter.cpp
     dom/EventTarget.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-25  Andreas Kling  <akling@apple.com>
+
+        Remove EventPathWalker.
+        <https://webkit.org/b/121890>
+
+        Reviewed by Antti Koivisto.
+
+        Purge some more leftover Shadow DOM code.
+
+        * dom/EventPathWalker.cpp:
+        * dom/EventPathWalker.h:
+
+            Removed.
+
+        * dom/EventRetargeter.cpp:
+        (WebCore::nodeOrHostIfPseudoElement):
+        (WebCore::EventRetargeter::calculateEventPath):
+        (WebCore::EventRetargeter::buildRelatedNodeMap):
+
+            If starting at a pseudo element, e.g for events originating from
+            a transition on :before/:after, retarget to the pseudo element's
+            host as appropriate. This was the only real "feature" we were
+            using in EventPathWalker.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseDraggedEvent):
+        (WebCore::EventHandler::updateDragAndDrop):
+        (WebCore::EventHandler::updateMouseEventTargetNode):
+        (WebCore::EventHandler::handleWheelEvent):
+        (WebCore::EventHandler::handleTouchEvent):
+
+            Replace use of EventPathWalker with parentOrShadowHostElement()
+            parent chain climbing.
+
 2013-09-25  Gurpreet Kaur  <k.gurpreet@samsung.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2928 +2928 @@
         Source/WebCore/dom/EventNames.cpp \
         Source/WebCore/dom/EventNames.h \
-        Source/WebCore/dom/EventPathWalker.cpp \
-        Source/WebCore/dom/EventPathWalker.h \
         Source/WebCore/dom/EventRetargeter.cpp \
         Source/WebCore/dom/EventRetargeter.h \

trunk/Source/WebCore/Target.pri

@@ -410 +410 @@
     dom/EventListenerMap.cpp \
     dom/EventNames.cpp \
-    dom/EventPathWalker.cpp \
     dom/EventRetargeter.cpp \
     dom/EventTarget.cpp \
@@ -1615 +1614 @@
     dom/EventListenerMap.h \
     dom/EventNames.h \
-    dom/EventPathWalker.h \
     dom/EventQueue.h \
     dom/EventSender.h \

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1515 +1515 @@
                 4A9CC82016BF9BB400EC645A /* InspectorCSSOMWrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */; };
                 4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */; };
-                4AAAB4C416D379B5001DA41B /* EventPathWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AAAB4C216D379B5001DA41B /* EventPathWalker.cpp */; };
-                4AAAB4C516D379B5001DA41B /* EventPathWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AAAB4C316D379B5001DA41B /* EventPathWalker.h */; };
                 4ACBC0BE12713CBD0094F9B2 /* ClassList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */; };
                 4ACBC0BF12713CBD0094F9B2 /* ClassList.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ACBC0BD12713CBD0094F9B2 /* ClassList.h */; };
@@ -8099 +8097 @@
                 4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCSSOMWrappers.cpp; sourceTree = "<group>"; };
                 4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCSSOMWrappers.h; sourceTree = "<group>"; };
-                4AAAB4C216D379B5001DA41B /* EventPathWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventPathWalker.cpp; sourceTree = "<group>"; };
-                4AAAB4C316D379B5001DA41B /* EventPathWalker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventPathWalker.h; sourceTree = "<group>"; };
                 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClassList.cpp; sourceTree = "<group>"; };
                 4ACBC0BD12713CBD0094F9B2 /* ClassList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClassList.h; sourceTree = "<group>"; };
@@ -20960 +20956 @@
                                 939885C208B7E3D100E707C4 /* EventNames.h */,
                                 BC9A6142146859D9006057FD /* EventNames.in */,
-                                4AAAB4C216D379B5001DA41B /* EventPathWalker.cpp */,
-                                4AAAB4C316D379B5001DA41B /* EventPathWalker.h */,
                                 8F6756191288B17B0047ACA3 /* EventQueue.h */,
                                 4A5CB1C316C3A5FD00AB2886 /* EventRetargeter.cpp */,
@@ -22433 +22427 @@
                                 1CA19E160DC255CA0065A994 /* EventLoop.h in Headers */,
                                 939885C408B7E3D100E707C4 /* EventNames.h in Headers */,
-                                4AAAB4C516D379B5001DA41B /* EventPathWalker.h in Headers */,
                                 8F67561B1288B17B0047ACA3 /* EventQueue.h in Headers */,
                                 4A5CB1C616C3A5FD00AB2886 /* EventRetargeter.h in Headers */,
@@ -25729 +25722 @@
                                 1CA19E050DC255950065A994 /* EventLoopMac.mm in Sources */,
                                 939885C308B7E3D100E707C4 /* EventNames.cpp in Sources */,
-                                4AAAB4C416D379B5001DA41B /* EventPathWalker.cpp in Sources */,
                                 07969DB917D14151007FF842 /* JSRTCPeerConnection.cpp in Sources */,
                                 4A5CB1C516C3A5FD00AB2886 /* EventRetargeter.cpp in Sources */,

trunk/Source/WebCore/dom/DOMAllInOne.cpp

@@ -78 +78 @@
 #include "EventListenerMap.cpp"
 #include "EventNames.cpp"
-#include "EventPathWalker.cpp"
 #include "EventRetargeter.cpp"
 #include "EventTarget.cpp"

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -30 +30 @@
 #include "EventContext.h"
 #include "EventDispatchMediator.h"
-#include "EventPathWalker.h"
 #include "EventRetargeter.h"
 #include "FrameView.h"

trunk/Source/WebCore/dom/EventRetargeter.cpp

@@ -23 +23 @@
 #include "ContainerNode.h"
 #include "EventContext.h"
-#include "EventPathWalker.h"
 #include "FocusEvent.h"
 #include "MouseEvent.h"
@@ -76 +75 @@
 }
 
-void EventRetargeter::calculateEventPath(Node* node, Event* event, EventPath& eventPath)
-{
-    bool inDocument = node->inDocument();
-    bool isSVGElement = node->isSVGElement();
+static Node* nodeOrHostIfPseudoElement(Node* node)
+{
+    return node->isPseudoElement() ? toPseudoElement(node)->hostElement() : node;
+}
+
+void EventRetargeter::calculateEventPath(Node* targetNode, Event* event, EventPath& eventPath)
+{
+    bool inDocument = targetNode->inDocument();
+    bool isSVGElement = targetNode->isSVGElement();
     bool isMouseOrFocusEvent = event->isMouseEvent() || event->isFocusEvent();
 #if ENABLE(TOUCH_EVENTS)
@@ -85 +89 @@
 #endif
     Vector<EventTarget*, 32> targetStack;
-    for (EventPathWalker walker(node); walker.node(); walker.moveToParent()) {
-        Node* node = walker.node();
+
+    for (Node* node = nodeOrHostIfPseudoElement(targetNode); node; node = node->parentOrShadowHostNode()) {
         if (targetStack.isEmpty())
             targetStack.append(eventTargetRespectingTargetRules(node));
-        else if (walker.isVisitingInsertionPointInReprojection())
-            targetStack.append(targetStack.last());
         if (isMouseOrFocusEvent)
             eventPath.append(adoptPtr(new MouseOrFocusEventContext(node, eventTargetRespectingTargetRules(node), targetStack.last())));
@@ -220 +222 @@
     Vector<Node*, 32> relatedNodeStack;
     TreeScope* lastTreeScope = 0;
-    for (EventPathWalker walker(relatedNode); walker.node(); walker.moveToParent()) {
-        Node* node = walker.node();
+    for (Node* node = nodeOrHostIfPseudoElement(const_cast<Node*>(relatedNode)); node; node = node->parentOrShadowHostNode()) {
         if (relatedNodeStack.isEmpty())
             relatedNodeStack.append(node);
-        else if (walker.isVisitingInsertionPointInReprojection())
-            relatedNodeStack.append(relatedNodeStack.last());
         TreeScope* scope = node->treeScope();
         // Skips adding a node to the map if treeScope does not change. Just for the performance optimization.

trunk/Source/WebCore/html/HTMLLIElement.cpp

@@ -27 +27 @@
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
-#include "EventPathWalker.h"
 #include "HTMLNames.h"
 #include "RenderListItem.h"

trunk/Source/WebCore/page/EventHandler.cpp

@@ -43 +43 @@
 #include "EditorClient.h"
 #include "EventNames.h"
-#include "EventPathWalker.h"
 #include "ExceptionCodePlaceholder.h"
 #include "FileList.h"
@@ -734 +733 @@
     RenderObject* renderer = targetNode->renderer();
     if (!renderer) {
-        Node* parent = EventPathWalker::parent(targetNode);
+        Element* parent = targetNode->parentOrShadowHostElement();
         if (!parent)
             return false;
@@ -2096 +2095 @@
     RefPtr<Node> newTarget = mev.targetNode();
     if (newTarget && newTarget->isTextNode())
-        newTarget = EventPathWalker::parent(newTarget.get());
+        newTarget = newTarget->parentOrShadowHostElement();
 
     m_autoscrollController->updateDragAndDrop(newTarget.get(), event.position(), event.timestamp());
@@ -2233 +2232 @@
         // If the target node is a text node, dispatch on the parent node - rdar://4196646
         if (result && result->isTextNode())
-            result = EventPathWalker::parent(result);
+            result = result->parentOrShadowHostElement();
     }
     m_nodeUnderMouse = result;
@@ -2480 +2479 @@
     bool useLatchedWheelEventNode = e.useLatchedEventNode();
 
-    // FIXME: Is the following code different from just calling innerElement?
-    Node* node = result.innerNode();
-    // Wheel events should not dispatch to text nodes.
-    if (node && node->isTextNode())
-        node = EventPathWalker::parent(node);
+    // FIXME: This code should use Element* instead of Node*.
+    Node* node = result.innerElement();
 
     bool isOverWidget;
@@ -4025 +4021 @@
                 continue;
 
-            // FIXME: Is the following code different from just calling innerElement?
-            Node* node = result.innerNode();
+            // FIXME: This code should use Element* instead of Node*.
+            Node* node = result.innerElement();
             ASSERT(node);
-            // Touch events should not go to text nodes
-            if (node->isTextNode())
-                node = EventPathWalker::parent(node);
 
             if (InspectorInstrumentation::handleTouchEvent(m_frame.page(), node))