Changeset 143422 in webkit


Ignore:
Timestamp:
Feb 19, 2013 6:27:30 PM (11 years ago)
Author:
hayato@chromium.org
Message:

Rename AncestorChainWalker.
​https://bugs.webkit.org/show_bug.cgi?id=110146

Reviewed by Dimitri Glazkov.

Rename AncestorChainWalker to EventPathWalker.
The term of EventPath is used in DOM Core spec. EventPath was
already introduced into a EventContext.h in r112055. We should
spread this term into the Walker class since they share the same
purpose.

No new tests, no behavior change.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/DOMAllInOne.cpp:
  • dom/EventDispatcher.cpp:
  • dom/EventPathWalker.cpp: Renamed from Source/WebCore/dom/AncestorChainWalker.cpp.

(WebCore):
(WebCore::EventPathWalker::EventPathWalker):
(WebCore::EventPathWalker::parent): parent() is now a static function to cover simple use cases.
(WebCore::EventPathWalker::moveToParent): Renamed from parent().

  • dom/EventPathWalker.h: Renamed from Source/WebCore/dom/AncestorChainWalker.h.

(WebCore):
(EventPathWalker):
(WebCore::EventPathWalker::node):
(WebCore::EventPathWalker::isVisitingInsertionPointInReprojection): Renamed from isCrossingInsertionPoint().

  • dom/EventRetargeter.cpp:

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

  • dom/TreeScope.cpp:

(WebCore::TreeScope::focusedNode):

  • html/HTMLLIElement.cpp:

(WebCore::HTMLLIElement::attach):

  • page/EventHandler.cpp:

(WebCore::EventHandler::updateMouseEventTargetNode):
(WebCore::EventHandler::handleWheelEvent):

Location:
trunk/Source/WebCore
Files:
12 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r143136 r143422  
    11181118
    11191119    dom/ActiveDOMObject.cpp
    1120     dom/AncestorChainWalker.cpp
    11211120    dom/Attr.cpp
    11221121    dom/BeforeTextInsertedEvent.cpp
    … …  
    11771176    dom/EventListenerMap.cpp
    11781177    dom/EventNames.cpp
     1178    dom/EventPathWalker.cpp
    11791179    dom/EventRetargeter.cpp
    11801180    dom/EventTarget.cpp

  • trunk/Source/WebCore/ChangeLog

    r143421 r143422  
     12013-02-19  Hayato Ito  <hayato@chromium.org>
     2
     3        Rename AncestorChainWalker.
     4        https://bugs.webkit.org/show_bug.cgi?id=110146
     5
     6        Reviewed by Dimitri Glazkov.
     7
     8        Rename AncestorChainWalker to EventPathWalker.
     9        The term of EventPath is used in DOM Core spec.  EventPath was
     10        already introduced into a EventContext.h in r112055. We should
     11        spread this term into the Walker class since they share the same
     12        purpose.
     13
     14        No new tests, no behavior change.
     15
     16        * CMakeLists.txt:
     17        * GNUmakefile.list.am:
     18        * Target.pri:
     19        * WebCore.gypi:
     20        * WebCore.xcodeproj/project.pbxproj:
     21        * dom/DOMAllInOne.cpp:
     22        * dom/EventDispatcher.cpp:
     23        * dom/EventPathWalker.cpp: Renamed from Source/WebCore/dom/AncestorChainWalker.cpp.
     24        (WebCore):
     25        (WebCore::EventPathWalker::EventPathWalker):
     26        (WebCore::EventPathWalker::parent): parent() is now a static function to cover simple use cases.
     27        (WebCore::EventPathWalker::moveToParent): Renamed from parent().
     28        * dom/EventPathWalker.h: Renamed from Source/WebCore/dom/AncestorChainWalker.h.
     29        (WebCore):
     30        (EventPathWalker):
     31        (WebCore::EventPathWalker::node):
     32        (WebCore::EventPathWalker::isVisitingInsertionPointInReprojection): Renamed from isCrossingInsertionPoint().
     33        * dom/EventRetargeter.cpp:
     34        (WebCore::EventRetargeter::calculateEventPath):
     35        (WebCore::EventRetargeter::buildRelatedNodeMap):
     36        * dom/TreeScope.cpp:
     37        (WebCore::TreeScope::focusedNode):
     38        * html/HTMLLIElement.cpp:
     39        (WebCore::HTMLLIElement::attach):
     40        * page/EventHandler.cpp:
     41        (WebCore::EventHandler::updateMouseEventTargetNode):
     42        (WebCore::EventHandler::handleWheelEvent):
     43
    1442013-02-19  Dean Jackson  <dino@apple.com>
    245

  • trunk/Source/WebCore/GNUmakefile.list.am

    r143264 r143422  
    27442744        Source/WebCore/dom/ActiveDOMObject.cpp \
    27452745        Source/WebCore/dom/ActiveDOMObject.h \
    2746         Source/WebCore/dom/AncestorChainWalker.cpp \
    2747         Source/WebCore/dom/AncestorChainWalker.h \
    27482746        Source/WebCore/dom/Attr.cpp \
    27492747        Source/WebCore/dom/Attr.h \
    … …  
    28772875        Source/WebCore/dom/EventNames.cpp \
    28782876        Source/WebCore/dom/EventNames.h \
     2877        Source/WebCore/dom/EventPathWalker.cpp \
     2878        Source/WebCore/dom/EventPathWalker.h \
    28792879        Source/WebCore/dom/EventRetargeter.cpp \
    28802880        Source/WebCore/dom/EventTarget.cpp \

  • trunk/Source/WebCore/Target.pri

    r143264 r143422  
    353353    css/WebKitCSSViewportRule.cpp \
    354354    dom/ActiveDOMObject.cpp \
    355     dom/AncestorChainWalker.cpp \
    356355    dom/Attr.cpp \
    357356    dom/BeforeTextInsertedEvent.cpp \
    … …  
    411410    dom/EventListenerMap.cpp \
    412411    dom/EventNames.cpp \
     412    dom/EventPathWalker.cpp \
    413413    dom/EventRetargeter.cpp \
    414414    dom/EventTarget.cpp \

  • trunk/Source/WebCore/WebCore.gypi

    r143264 r143422  
    27372737        'webcore_dom_files': [
    27382738            'dom/ActiveDOMObject.cpp',
    2739             'dom/AncestorChainWalker.cpp',
    2740             'dom/AncestorChainWalker.h',
    27412739            'dom/Attr.cpp',
    27422740            'dom/AutocompleteErrorEvent.h',
    … …  
    28422840            'dom/EventListenerMap.cpp',
    28432841            'dom/EventNames.cpp',
     2842            'dom/EventPathWalker.cpp',
     2843            'dom/EventPathWalker.h',
    28442844            'dom/EventQueue.h',
    28452845            'dom/EventSender.h',

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

    r143270 r143422  
    14611461                4A9CC82016BF9BB400EC645A /* InspectorCSSOMWrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */; };
    14621462                4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */; };
     1463                4AAAB4C416D379B5001DA41B /* EventPathWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AAAB4C216D379B5001DA41B /* EventPathWalker.cpp */; };
     1464                4AAAB4C516D379B5001DA41B /* EventPathWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AAAB4C316D379B5001DA41B /* EventPathWalker.h */; };
    14631465                4ABDFF0B14DBE385004D117D /* HTMLShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ABDFF0714DBE312004D117D /* HTMLShadowElement.cpp */; };
    14641466                4ABDFF0C14DBE385004D117D /* HTMLShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ABDFF0814DBE312004D117D /* HTMLShadowElement.h */; };
    … …  
    39593961                A781C6A713828B5D0012A62A /* DocumentMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A781C6A613828B5D0012A62A /* DocumentMarker.cpp */; };
    39603962                A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* Clipboard.cpp */; };
    3961                 A78CDD2E169E91A1009136F3 /* AncestorChainWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A75CBE43169E913D0003A60F /* AncestorChainWalker.cpp */; };
    3962                 A78CDD30169E91A4009136F3 /* AncestorChainWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = A75CBE44169E913D0003A60F /* AncestorChainWalker.h */; };
    39633963                A78E526F1346BD1700AD9C31 /* MeterShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */; };
    39643964                A78E52701346BD1700AD9C31 /* MeterShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */; };
    … …  
    88958895                4A9CC81E16BF9BB400EC645A /* InspectorCSSOMWrappers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCSSOMWrappers.cpp; sourceTree = "<group>"; };
    88968896                4A9CC81F16BF9BB400EC645A /* InspectorCSSOMWrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCSSOMWrappers.h; sourceTree = "<group>"; };
     8897                4AAAB4C216D379B5001DA41B /* EventPathWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventPathWalker.cpp; sourceTree = "<group>"; };
     8898                4AAAB4C316D379B5001DA41B /* EventPathWalker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventPathWalker.h; sourceTree = "<group>"; };
    88978899                4ABDFF0714DBE312004D117D /* HTMLShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLShadowElement.cpp; sourceTree = "<group>"; };
    88988900                4ABDFF0814DBE312004D117D /* HTMLShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLShadowElement.h; sourceTree = "<group>"; };
    … …  
    1143511437                A73F95FD12C97BFE0031AAF9 /* RoundedRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoundedRect.h; sourceTree = "<group>"; };
    1143611438                A74BB76A13BDA86300FF7BF0 /* ExceptionCodePlaceholder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionCodePlaceholder.h; sourceTree = "<group>"; };
    11437                 A75CBE43169E913D0003A60F /* AncestorChainWalker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AncestorChainWalker.cpp; sourceTree = "<group>"; };
    11438                 A75CBE44169E913D0003A60F /* AncestorChainWalker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AncestorChainWalker.h; sourceTree = "<group>"; };
    1143911439                A75E497410752ACB00C9B896 /* SerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SerializedScriptValue.h; sourceTree = "<group>"; };
    1144011440                A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SerializedScriptValue.cpp; sourceTree = "<group>"; };
    … …  
    2244422444                                E1C4DE6D0EA75C650023CCD6 /* ActiveDOMObject.cpp */,
    2244522445                                E1C4DE680EA75C1E0023CCD6 /* ActiveDOMObject.h */,
    22446                                 A75CBE43169E913D0003A60F /* AncestorChainWalker.cpp */,
    22447                                 A75CBE44169E913D0003A60F /* AncestorChainWalker.h */,
    2244822446                                A8C4A7FC09D563270003AC8D /* Attr.cpp */,
    2244922447                                A8C4A7FB09D563270003AC8D /* Attr.h */,
    … …  
    2260622604                                939885C208B7E3D100E707C4 /* EventNames.h */,
    2260722605                                BC9A6142146859D9006057FD /* EventNames.in */,
     22606                                4AAAB4C216D379B5001DA41B /* EventPathWalker.cpp */,
     22607                                4AAAB4C316D379B5001DA41B /* EventPathWalker.h */,
    2260822608                                8F6756191288B17B0047ACA3 /* EventQueue.h */,
    2260922609                                4A5CB1C316C3A5FD00AB2886 /* EventRetargeter.cpp */,
    … …  
    2322723227                                CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */,
    2322823228                                FD31603E12B0267600C1A359 /* AnalyserNode.h in Headers */,
    23229                                 A78CDD30169E91A4009136F3 /* AncestorChainWalker.h in Headers */,
    2323023229                                490707E71219C04300D90E51 /* ANGLEWebKitBridge.h in Headers */,
    2323123230                                49E912AB0EFAC906009D0CAF /* Animation.h in Headers */,
    … …  
    2433424333                                1CA19E160DC255CA0065A994 /* EventLoop.h in Headers */,
    2433524334                                939885C408B7E3D100E707C4 /* EventNames.h in Headers */,
     24335                                4AAAB4C516D379B5001DA41B /* EventPathWalker.h in Headers */,
    2433624336                                8F67561B1288B17B0047ACA3 /* EventQueue.h in Headers */,
    2433724337                                E0FEF372B17C53EAC1C1FBEE /* EventSource.h in Headers */,
    … …  
    2696226962                                CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */,
    2696326963                                FD31603D12B0267600C1A359 /* AnalyserNode.cpp in Sources */,
    26964                                 A78CDD2E169E91A1009136F3 /* AncestorChainWalker.cpp in Sources */,
    2696526964                                490707E61219C04300D90E51 /* ANGLEWebKitBridge.cpp in Sources */,
    2696626965                                49E912AA0EFAC906009D0CAF /* Animation.cpp in Sources */,
    … …  
    2768227681                                939885C308B7E3D100E707C4 /* EventNames.cpp in Sources */,
    2768327682                                E0FEF372B27C53EAC1C1FBEE /* EventSource.cpp in Sources */,
     27683                                4AAAB4C416D379B5001DA41B /* EventPathWalker.cpp in Sources */,
    2768427684                                4A5CB1C516C3A5FD00AB2886 /* EventRetargeter.cpp in Sources */,
    2768527685                                E12EDBEA0B308E0B002704B6 /* EventTarget.cpp in Sources */,

  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r142959 r143422  
    2727
    2828#include "ActiveDOMObject.cpp"
    29 #include "AncestorChainWalker.cpp"
    3029#include "Attr.cpp"
    3130#include "BeforeTextInsertedEvent.cpp"
    … …  
    8180#include "EventListenerMap.cpp"
    8281#include "EventNames.cpp"
     82#include "EventPathWalker.cpp"
    8383#include "EventRetargeter.cpp"
    8484#include "EventTarget.cpp"

  • trunk/Source/WebCore/dom/EventDispatcher.cpp

    r143303 r143422  
    2727#include "EventDispatcher.h"
    2828
    29 #include "AncestorChainWalker.h"
    3029#include "ContainerNode.h"
    3130#include "ElementShadow.h"
    3231#include "EventContext.h"
    3332#include "EventDispatchMediator.h"
     33#include "EventPathWalker.h"
    3434#include "EventRetargeter.h"
    3535#include "FrameView.h"

  • trunk/Source/WebCore/dom/EventPathWalker.cpp

    r143421 r143422  
    2626
    2727#include "config.h"
    28 #include "AncestorChainWalker.h"
     28#include "EventPathWalker.h"
    2929
    3030#include "ContentDistributor.h"
    … …  
    3434namespace WebCore {
    3535
    36 AncestorChainWalker::AncestorChainWalker(const Node* node)
     36EventPathWalker::EventPathWalker(const Node* node)
    3737    : m_node(node)
    3838    , m_distributedNode(node)
    39     , m_isCrossingInsertionPoint(false)
     39    , m_isVisitingInsertionPointInReprojection(false)
    4040{
    4141    ASSERT(node);
    4242}
    4343
    44 void AncestorChainWalker::parent()
     44Node* EventPathWalker::parent(const Node* node)
     45{
     46    EventPathWalker walker(node);
     47    walker.moveToParent();
     48    return walker.node();
     49}
     50
     51void EventPathWalker::moveToParent()
    4552{
    4653    ASSERT(m_node);
    … …  
    4956        if (InsertionPoint* insertionPoint = shadow->distributor().findInsertionPointFor(m_distributedNode)) {
    5057            m_node = insertionPoint;
    51             m_isCrossingInsertionPoint = true;
     58            m_isVisitingInsertionPointInReprojection = true;
    5259            return;
    5360        }
    … …  
    5764        if (!(m_node && m_node->isShadowRoot() && ScopeContentDistribution::assignedTo(toShadowRoot(m_node))))
    5865            m_distributedNode = m_node;
    59         m_isCrossingInsertionPoint = false;
     66        m_isVisitingInsertionPointInReprojection = false;
    6067        return;
    6168    }
    … …  
    6471    if (InsertionPoint* insertionPoint = ScopeContentDistribution::assignedTo(shadowRoot)) {
    6572        m_node = insertionPoint;
    66         m_isCrossingInsertionPoint = true;
     73        m_isVisitingInsertionPointInReprojection = true;
    6774        return;
    6875    }
    6976    m_node = shadowRoot->host();
    7077    m_distributedNode = m_node;
    71     m_isCrossingInsertionPoint = false;
     78    m_isVisitingInsertionPointInReprojection = false;
    7279}
    7380

  • trunk/Source/WebCore/dom/EventPathWalker.h

    r143421 r143422  
    2525 */
    2626
    27 #ifndef AncestorChainWalker_h
    28 #define AncestorChainWalker_h
     27#ifndef EventPathWalker_h
     28#define EventPathWalker_h
    2929
    3030namespace WebCore {
    … …  
    3232class Node;
    3333
    34 class AncestorChainWalker {
     34class EventPathWalker {
    3535public:
    36     explicit AncestorChainWalker(const Node*);
    37     void parent();
    38     Node* get() const { return const_cast<Node*>(m_node); }
    39     bool crossingInsertionPoint() { return m_isCrossingInsertionPoint; }
     36    explicit EventPathWalker(const Node*);
     37    static Node* parent(const Node*);
     38    void moveToParent();
     39    Node* node() const { return const_cast<Node*>(m_node); }
     40    bool isVisitingInsertionPointInReprojection() { return m_isVisitingInsertionPointInReprojection; }
    4041
    4142private:
    4243    const Node* m_node;
    4344    const Node* m_distributedNode;
    44     bool m_isCrossingInsertionPoint;
     45    bool m_isVisitingInsertionPointInReprojection;
    4546};
    4647

  • trunk/Source/WebCore/dom/EventRetargeter.cpp

    r142957 r143422  
    2121#include "EventRetargeter.h"
    2222
    23 #include "AncestorChainWalker.h"
    2423#include "ContainerNode.h"
    2524#include "EventContext.h"
     25#include "EventPathWalker.h"
    2626#include "FocusEvent.h"
    2727#include "MouseEvent.h"
    … …  
    7979    bool isMouseOrFocusEvent = event->isMouseEvent() || event->isFocusEvent();
    8080    Vector<EventTarget*, 32> targetStack;
    81     for (AncestorChainWalker walker(node); walker.get(); walker.parent()) {
    82         Node* node = walker.get();
     81    for (EventPathWalker walker(node); walker.node(); walker.moveToParent()) {
     82        Node* node = walker.node();
    8383        if (targetStack.isEmpty())
    8484            targetStack.append(eventTargetRespectingTargetRules(node));
    85         else if (walker.crossingInsertionPoint())
     85        else if (walker.isVisitingInsertionPointInReprojection())
    8686            targetStack.append(targetStack.last());
    8787        if (isMouseOrFocusEvent)
    … …  
    169169    Vector<Node*, 32> relatedNodeStack;
    170170    TreeScope* lastTreeScope = 0;
    171     for (AncestorChainWalker walker(relatedNode); walker.get(); walker.parent()) {
    172         Node* node = walker.get();
     171    for (EventPathWalker walker(relatedNode); walker.node(); walker.moveToParent()) {
     172        Node* node = walker.node();
    173173        if (relatedNodeStack.isEmpty())
    174174            relatedNodeStack.append(node);
    175         else if (walker.crossingInsertionPoint())
     175        else if (walker.isVisitingInsertionPointInReprojection())
    176176            relatedNodeStack.append(relatedNodeStack.last());
    177177        TreeScope* scope = node->treeScope();

  • trunk/Source/WebCore/dom/TreeScope.cpp

    r141570 r143422  
    2828#include "TreeScope.h"
    2929
    30 #include "AncestorChainWalker.h"
    3130#include "ContainerNode.h"
    3231#include "DOMSelection.h"
    … …  
    3433#include "Document.h"
    3534#include "Element.h"
     35#include "EventPathWalker.h"
    3636#include "FocusController.h"
    3737#include "Frame.h"
    … …  
    353353        return 0;
    354354    Vector<Node*> targetStack;
    355     for (AncestorChainWalker walker(node); walker.get(); walker.parent()) {
    356         Node* node = walker.get();
     355    for (EventPathWalker walker(node); walker.node(); walker.moveToParent()) {
     356        Node* node = walker.node();
    357357        if (targetStack.isEmpty())
    358358            targetStack.append(node);
    359         else if (walker.crossingInsertionPoint())
     359        else if (walker.isVisitingInsertionPointInReprojection())
    360360            targetStack.append(targetStack.last());
    361361        if (node == rootNode())

  • trunk/Source/WebCore/html/HTMLLIElement.cpp

    r139325 r143422  
    2424#include "HTMLLIElement.h"
    2525
    26 #include "AncestorChainWalker.h"
    2726#include "Attribute.h"
    2827#include "CSSPropertyNames.h"
    2928#include "CSSValueKeywords.h"
     29#include "EventPathWalker.h"
    3030#include "HTMLNames.h"
    3131#include "RenderListItem.h"
    … …  
    9797        // Find the enclosing list node.
    9898        Node* listNode = 0;
    99         AncestorChainWalker walker(this);
     99        EventPathWalker walker(this);
    100100        while (!listNode) {
    101             walker.parent();
    102             if (!walker.get())
     101            walker.moveToParent();
     102            if (!walker.node())
    103103                break;
    104             if (walker.get()->hasTagName(ulTag) || walker.get()->hasTagName(olTag))
    105                 listNode = walker.get();
     104            if (walker.node()->hasTagName(ulTag) || walker.node()->hasTagName(olTag))
     105                listNode = walker.node();
    106106        }
    107107

  • trunk/Source/WebCore/page/EventHandler.cpp

    r143148 r143422  
    3030
    3131#include "AXObjectCache.h"
    32 #include "AncestorChainWalker.h"
    3332#include "AutoscrollController.h"
    3433#include "CachedImage.h"
    … …  
    4443#include "EditorClient.h"
    4544#include "EventNames.h"
     45#include "EventPathWalker.h"
    4646#include "ExceptionCodePlaceholder.h"
    4747#include "FloatPoint.h"
    … …  
    21202120    else {
    21212121        // If the target node is a text node, dispatch on the parent node - rdar://4196646
    2122         if (result && result->isTextNode()) {
    2123             AncestorChainWalker walker(result);
    2124             walker.parent();
    2125             result = walker.get();
    2126         }
     2122        if (result && result->isTextNode())
     2123            result = EventPathWalker::parent(result);
    21272124    }
    21282125    m_nodeUnderMouse = result;
    … …  
    23322329    Node* node = result.innerNode();
    23332330    // Wheel events should not dispatch to text nodes.
    2334     if (node && node->isTextNode()) {
    2335         AncestorChainWalker walker(node);
    2336         walker.parent();
    2337         node = walker.get();
    2338     }
     2331    if (node && node->isTextNode())
     2332        node = EventPathWalker::parent(node);
    23392333
    23402334    bool isOverWidget;
Note: See TracChangeset for help on using the changeset viewer.