Changeset 137406 in webkit

Timestamp:

Dec 11, 2012 7:12:23 PM (11 years ago)

Author:

Antti Koivisto

Message:

Add Element-specific traversal functions
​https://bugs.webkit.org/show_bug.cgi?id=104685

Reviewed by Ryosuke Niwa.

In many cases where we use NodeTraversal we really only want Elements. By having
Element specific iteration functions we can tighten the code and make it faster too.

This patch adds ElementTraversal namespace, similar to NodeTraversal. It also switches
bunch of NodeTraversal call sites that obviously only care about elements to using
the new interface.

This should be a speedup too as we avoid number of branches by not having to look
for children of non-ContainerNodes and by allowing use of ContainerNode specific
accessors.

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::addImageMapChildren):

• css/SelectorChecker.cpp:

(WebCore::linkAttribute):
(WebCore::SelectorChecker::allVisitedStateChanged):
(WebCore::SelectorChecker::visitedStateChanged):

• css/StyleInvalidationAnalysis.cpp:

(WebCore::elementMatchesSelectorScopes):
(WebCore::StyleInvalidationAnalysis::invalidateStyle):

• dom/ContainerNodeAlgorithms.h:

(WebCore::ChildFrameDisconnector::collectDescendant):

• dom/Document.cpp:

(WebCore::Document::buildAccessKeyMap):
(WebCore::Document::updateBaseURL):
(WebCore::Document::processBaseElement):

• dom/DocumentOrderedMap.cpp:

(WebCore::DocumentOrderedMap::get):

• dom/Element.cpp:

(WebCore::Element::firstElementChild):

• dom/Element.h:

(WebCore):

• dom/ElementShadow.cpp:

(WebCore::ElementShadow::collectSelectFeatureSetFrom):

• dom/NodeTraversal.h:

(ElementTraversal):
(WebCore):
(WebCore::ElementTraversal::traverseNextElementTemplate):
(WebCore::ElementTraversal::next):
(WebCore::ElementTraversal::firstWithin):
(WebCore::ElementTraversal::traverseNextElementSkippingChildrenTemplate):
(WebCore::ElementTraversal::nextSkippingChildren):
(NodeTraversal):

• dom/TreeScope.cpp:

(WebCore::TreeScope::labelElementForId):
(WebCore::TreeScope::findAnchor):

• editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):

• editing/DeleteSelectionCommand.cpp:

(WebCore::DeleteSelectionCommand::handleGeneralDelete):

• editing/FrameSelection.cpp:

(WebCore::scanForForm):

• editing/markup.cpp:

(WebCore::completeURLs):

• html/HTMLFieldSetElement.cpp:

(WebCore::HTMLFieldSetElement::invalidateDisabledStateUnder):
(WebCore::HTMLFieldSetElement::childrenChanged):
(WebCore::HTMLFieldSetElement::legend):
(WebCore::HTMLFieldSetElement::refreshElementsIfNeeded):

• html/HTMLFormElement.cpp:

(WebCore::HTMLFormElement::formElementIndex):

• html/HTMLLabelElement.cpp:

(WebCore::HTMLLabelElement::control):

• html/HTMLLegendElement.cpp:

(WebCore::HTMLLegendElement::associatedControl):

• html/HTMLMapElement.cpp:

(WebCore::HTMLMapElement::mapMouseEvent):

• html/HTMLNameCollection.cpp:

(WebCore::HTMLNameCollection::virtualItemAfter):

• html/HTMLObjectElement.cpp:

(WebCore::HTMLObjectElement::containsJavaApplet):

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::recalcListItems):

• html/shadow/ContentDistributor.cpp:

(WebCore::ShadowRootContentDistributionData::ensureInsertionPointList):

• page/FocusController.cpp:

(WebCore::FocusController::findFocusCandidateInContainer):

• rendering/RenderCounter.cpp:

(WebCore::nextInPreOrder):

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::collectIntersectionOrEnclosureList):

• svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::title):

• svg/SVGUseElement.cpp:

(WebCore::removeDisallowedElementsFromSubtree):

• svg/animation/SMILTimeContainer.cpp:

(WebCore::SMILTimeContainer::updateDocumentOrderIndexes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• css/SelectorChecker.cpp (modified) (3 diffs)
• css/StyleInvalidationAnalysis.cpp (modified) (2 diffs)
• dom/ContainerNodeAlgorithms.h (modified) (1 diff)
• dom/Document.cpp (modified) (4 diffs)
• dom/DocumentOrderedMap.cpp (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/Element.h (modified) (1 diff)
• dom/ElementShadow.cpp (modified) (2 diffs)
• dom/NodeTraversal.h (modified) (2 diffs)
• dom/TreeScope.cpp (modified) (2 diffs)
• editing/CompositeEditCommand.cpp (modified) (1 diff)
• editing/DeleteSelectionCommand.cpp (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (1 diff)
• editing/markup.cpp (modified) (2 diffs)
• html/BaseMultipleFieldsDateAndTimeInputType.cpp (modified) (2 diffs)
• html/HTMLFieldSetElement.cpp (modified) (4 diffs)
• html/HTMLFormElement.cpp (modified) (2 diffs)
• html/HTMLLabelElement.cpp (modified) (1 diff)
• html/HTMLLegendElement.cpp (modified) (2 diffs)
• html/HTMLMapElement.cpp (modified) (1 diff)
• html/HTMLNameCollection.cpp (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (2 diffs)
• html/HTMLSelectElement.cpp (modified) (3 diffs)
• html/shadow/ContentDistributor.cpp (modified) (1 diff)
• page/FocusController.cpp (modified) (2 diffs)
• rendering/RenderCounter.cpp (modified) (4 diffs)
• svg/SVGSVGElement.cpp (modified) (1 diff)
• svg/SVGStyledElement.cpp (modified) (2 diffs)
• svg/SVGUseElement.cpp (modified) (1 diff)
• svg/animation/SMILTimeContainer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-11  Antti Koivisto  <antti@apple.com>
+
+        Add Element-specific traversal functions
+        https://bugs.webkit.org/show_bug.cgi?id=104685
+
+        Reviewed by Ryosuke Niwa.
+
+        In many cases where we use NodeTraversal we really only want Elements. By having
+        Element specific iteration functions we can tighten the code and make it faster too.
+
+        This patch adds ElementTraversal namespace, similar to NodeTraversal. It also switches
+        bunch of NodeTraversal call sites that obviously only care about elements to using
+        the new interface.
+        
+        This should be a speedup too as we avoid number of branches by not having to look
+        for children of non-ContainerNodes and by allowing use of ContainerNode specific
+        accessors.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::addImageMapChildren):
+        * css/SelectorChecker.cpp:
+        (WebCore::linkAttribute):
+        (WebCore::SelectorChecker::allVisitedStateChanged):
+        (WebCore::SelectorChecker::visitedStateChanged):
+        * css/StyleInvalidationAnalysis.cpp:
+        (WebCore::elementMatchesSelectorScopes):
+        (WebCore::StyleInvalidationAnalysis::invalidateStyle):
+        * dom/ContainerNodeAlgorithms.h:
+        (WebCore::ChildFrameDisconnector::collectDescendant):
+        * dom/Document.cpp:
+        (WebCore::Document::buildAccessKeyMap):
+        (WebCore::Document::updateBaseURL):
+        (WebCore::Document::processBaseElement):
+        * dom/DocumentOrderedMap.cpp:
+        (WebCore::DocumentOrderedMap::get):
+        * dom/Element.cpp:
+        (WebCore::Element::firstElementChild):
+        * dom/Element.h:
+        (WebCore):
+        * dom/ElementShadow.cpp:
+        (WebCore::ElementShadow::collectSelectFeatureSetFrom):
+        * dom/NodeTraversal.h:
+        (ElementTraversal):
+        (WebCore):
+        (WebCore::ElementTraversal::traverseNextElementTemplate):
+        (WebCore::ElementTraversal::next):
+        (WebCore::ElementTraversal::firstWithin):
+        (WebCore::ElementTraversal::traverseNextElementSkippingChildrenTemplate):
+        (WebCore::ElementTraversal::nextSkippingChildren):
+        (NodeTraversal):
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::labelElementForId):
+        (WebCore::TreeScope::findAnchor):
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
+        * editing/DeleteSelectionCommand.cpp:
+        (WebCore::DeleteSelectionCommand::handleGeneralDelete):
+        * editing/FrameSelection.cpp:
+        (WebCore::scanForForm):
+        * editing/markup.cpp:
+        (WebCore::completeURLs):
+        * html/HTMLFieldSetElement.cpp:
+        (WebCore::HTMLFieldSetElement::invalidateDisabledStateUnder):
+        (WebCore::HTMLFieldSetElement::childrenChanged):
+        (WebCore::HTMLFieldSetElement::legend):
+        (WebCore::HTMLFieldSetElement::refreshElementsIfNeeded):
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::formElementIndex):
+        * html/HTMLLabelElement.cpp:
+        (WebCore::HTMLLabelElement::control):
+        * html/HTMLLegendElement.cpp:
+        (WebCore::HTMLLegendElement::associatedControl):
+        * html/HTMLMapElement.cpp:
+        (WebCore::HTMLMapElement::mapMouseEvent):
+        * html/HTMLNameCollection.cpp:
+        (WebCore::HTMLNameCollection::virtualItemAfter):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::containsJavaApplet):
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::recalcListItems):
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ShadowRootContentDistributionData::ensureInsertionPointList):
+        * page/FocusController.cpp:
+        (WebCore::FocusController::findFocusCandidateInContainer):
+        * rendering/RenderCounter.cpp:
+        (WebCore::nextInPreOrder):
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::collectIntersectionOrEnclosureList):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::title):
+        * svg/SVGUseElement.cpp:
+        (WebCore::removeDisallowedElementsFromSubtree):
+        * svg/animation/SMILTimeContainer.cpp:
+        (WebCore::SMILTimeContainer::updateDocumentOrderIndexes):
+
 2012-12-11  KyungTae Kim  <ktf.kim@samsung.com>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2658 +2658 @@
         return;
 
-    for (Node* current = map->firstChild(); current; current = NodeTraversal::next(current, map)) {
-        
+    for (Element* current = ElementTraversal::firstWithin(map); current; current = ElementTraversal::next(current, map)) {
         // add an <area> element for this child if it has a link
         if (current->hasTagName(areaTag) && current->isLink()) {

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -208 +208 @@
 }
 
-static inline const AtomicString* linkAttribute(Node* node)
-{
-    if (!node->isLink())
+static inline const AtomicString* linkAttribute(Element* element)
+{
+    if (!element->isLink())
         return 0;
-
-    ASSERT(node->isElementNode());
-    Element* element = static_cast<Element*>(node);
     if (element->isHTMLElement())
         return &element->fastGetAttribute(hrefAttr);
     if (element->isSVGElement())
         return &element->getAttribute(XLinkNames::hrefAttr);
-
     return 0;
 }
@@ -1226 +1222 @@
     if (m_linksCheckedForVisitedState.isEmpty())
         return;
-    for (Node* node = m_document; node; node = NodeTraversal::next(node)) {
-        if (node->isLink())
-            node->setNeedsStyleRecalc();
+    for (Element* element = ElementTraversal::firstWithin(m_document); element; element = ElementTraversal::next(element)) {
+        if (element->isLink())
+            element->setNeedsStyleRecalc();
     }
 }
@@ -1236 +1232 @@
     if (!m_linksCheckedForVisitedState.contains(visitedHash))
         return;
-    for (Node* node = m_document; node; node = NodeTraversal::next(node)) {
+    for (Element* element = ElementTraversal::firstWithin(m_document); element; element = ElementTraversal::next(element)) {
         LinkHash hash = 0;
-        if (node->hasTagName(aTag))
-            hash = static_cast<HTMLAnchorElement*>(node)->visitedLinkHash();
-        else if (const AtomicString* attr = linkAttribute(node))
+        if (element->hasTagName(aTag))
+            hash = static_cast<HTMLAnchorElement*>(element)->visitedLinkHash();
+        else if (const AtomicString* attr = linkAttribute(element))
             hash = visitedLinkHash(m_document->baseURL(), *attr);
         if (hash == visitedHash)
-            node->setNeedsStyleRecalc();
+            element->setNeedsStyleRecalc();
     }
 }

trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp

@@ -99 +99 @@
 }
 
-static bool elementMatchesSelectorScopes(const StyledElement* element, const HashSet<AtomicStringImpl*>& idScopes, const HashSet<AtomicStringImpl*>& classScopes)
+static bool elementMatchesSelectorScopes(const Element* element, const HashSet<AtomicStringImpl*>& idScopes, const HashSet<AtomicStringImpl*>& classScopes)
 {
     if (!idScopes.isEmpty() && element->hasID() && idScopes.contains(element->idForStyleResolution().impl()))
@@ -118 +118 @@
     if (m_idScopes.isEmpty() && m_classScopes.isEmpty())
         return;
-    Node* node = document->firstChild();
-    while (node) {
-        if (!node->isStyledElement()) {
-            node = NodeTraversal::next(node);
-            continue;
-        }
-        StyledElement* element = static_cast<StyledElement*>(node);
+    Element* element = ElementTraversal::firstWithin(document);
+    while (element) {
         if (elementMatchesSelectorScopes(element, m_idScopes, m_classScopes)) {
             element->setNeedsStyleRecalc();
             // The whole subtree is now invalidated, we can skip to the next sibling.
-            node = NodeTraversal::nextSkippingChildren(node);
+            element = ElementTraversal::nextSkippingChildren(element);
             continue;
         }
-        node = NodeTraversal::next(node);
+        element = ElementTraversal::next(element);
     }
 }

trunk/Source/WebCore/dom/ContainerNodeAlgorithms.h

@@ -317 +317 @@
 inline void ChildFrameDisconnector::collectDescendant(Node* root, ShouldIncludeRoot shouldIncludeRoot)
 {
-    for (Node* node = shouldIncludeRoot == IncludeRoot ? root : root->firstChild(); node; node = NodeTraversal::next(node, root)) {
-        if (!node->isElementNode())
-            continue;
-        Element* element = toElement(node);
+    Element* element = (shouldIncludeRoot == IncludeRoot && root->isElementNode()) ? toElement(root) : ElementTraversal::firstWithin(root);
+    for (; element; element = ElementTraversal::next(element, root)) {
         if (element->hasCustomCallbacks() && element->isFrameOwnerElement())
             m_list.append(toFrameOwnerElement(element));

trunk/Source/WebCore/dom/Document.cpp

@@ -751 +751 @@
     ASSERT(scope);
     Node* rootNode = scope->rootNode();
-    for (Node* node = rootNode; node; node = NodeTraversal::next(node, rootNode)) {
-        if (!node->isElementNode())
-            continue;
-        Element* element = static_cast<Element*>(node);
+    for (Element* element = ElementTraversal::firstWithin(rootNode); element; element = ElementTraversal::next(element, rootNode)) {
         const AtomicString& accessKey = element->getAttribute(accesskeyAttr);
         if (!accessKey.isEmpty())
             m_elementsByAccessKey.set(accessKey.impl(), element);
 
-        for (ShadowRoot* root = node->youngestShadowRoot(); root; root = root->olderShadowRoot())
+        for (ShadowRoot* root = element->youngestShadowRoot(); root; root = root->olderShadowRoot())
             buildAccessKeyMap(root);
     }
@@ -845 +842 @@
     ContainerNode::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
     
-    Element* newDocumentElement = firstElementChild(this);
+    Element* newDocumentElement = ElementTraversal::firstWithin(this);
     if (newDocumentElement == m_documentElement)
         return;
@@ -2668 +2665 @@
         // Base URL change changes any relative visited links.
         // FIXME: There are other URLs in the tree that would need to be re-evaluated on dynamic base URL change. Style should be invalidated too.
-        for (Node* node = firstChild(); node; node = NodeTraversal::next(node)) {
-            if (node->hasTagName(aTag))
-                static_cast<HTMLAnchorElement*>(node)->invalidateCachedVisitedLinkHash();
+        for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(element)) {
+            if (element->hasTagName(aTag))
+                static_cast<HTMLAnchorElement*>(element)->invalidateCachedVisitedLinkHash();
         }
     }
@@ -2686 +2683 @@
     const AtomicString* href = 0;
     const AtomicString* target = 0;
-    for (Node* node = document()->firstChild(); node && (!href || !target); node = NodeTraversal::next(node)) {
-        if (node->hasTagName(baseTag)) {
+    for (Element* element = ElementTraversal::firstWithin(this); element && (!href || !target); element = ElementTraversal::next(element)) {
+        if (element->hasTagName(baseTag)) {
             if (!href) {
-                const AtomicString& value = static_cast<Element*>(node)->fastGetAttribute(hrefAttr);
+                const AtomicString& value = element->fastGetAttribute(hrefAttr);
                 if (!value.isNull())
                     href = &value;
             }
             if (!target) {
-                const AtomicString& value = static_cast<Element*>(node)->fastGetAttribute(targetAttr);
+                const AtomicString& value = element->fastGetAttribute(targetAttr);
                 if (!value.isNull())
                     target = &value;

trunk/Source/WebCore/dom/DocumentOrderedMap.cpp

@@ -128 +128 @@
     if (m_duplicateCounts.contains(key)) {
         // We know there's at least one node that matches; iterate to find the first one.
-        for (Node* node = scope->rootNode()->firstChild(); node; node = NodeTraversal::next(node)) {
-            if (!node->isElementNode())
-                continue;
-            element = static_cast<Element*>(node);
+        for (element = ElementTraversal::firstWithin(scope->rootNode()); element; element = ElementTraversal::next(element)) {
             if (!keyMatches(key, element))
                 continue;

trunk/Source/WebCore/dom/Element.cpp

@@ -63 +63 @@
 #include "NodeRenderStyle.h"
 #include "NodeRenderingContext.h"
+#include "NodeTraversal.h"
 #include "Page.h"
 #include "PointerLockController.h"
@@ -2146 +2147 @@
 Element* Element::firstElementChild() const
 {
-    return WebCore::firstElementChild(this);
+    return ElementTraversal::firstWithin(this);
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -798 +798 @@
 }
 
-inline Element* firstElementChild(const ContainerNode* container)
-{
-    ASSERT_ARG(container, container);
-    Node* child = container->firstChild();
-    while (child && !child->isElementNode())
-        child = child->nextSibling();
-    return static_cast<Element*>(child);
-}
-
 inline bool Element::hasID() const
 {

trunk/Source/WebCore/dom/ElementShadow.cpp

@@ -222 +222 @@
 {
     if (root->hasElementShadow()) {
-        for (Node* node = root->firstChild(); node; node = NodeTraversal::next(node)) {
-            if (ElementShadow* elementShadow = node->isElementNode() ? toElement(node)->shadow() : 0) {
+        for (Element* element = ElementTraversal::firstWithin(root); element; element = ElementTraversal::next(element)) {
+            if (ElementShadow* elementShadow = element->shadow()) {
                 elementShadow->ensureSelectFeatureSetCollected();
                 m_selectFeatures.add(elementShadow->m_selectFeatures);
@@ -231 +231 @@
 
     if (root->hasContentElement()) {
-        for (Node* node = root->firstChild(); node; node = NodeTraversal::next(node)) {
-            if (isHTMLContentElement(node)) {
-                const CSSSelectorList& list = toHTMLContentElement(node)->selectorList();
+        for (Element* element = ElementTraversal::firstWithin(root); element; element = ElementTraversal::next(element)) {
+            if (isHTMLContentElement(element)) {
+                const CSSSelectorList& list = toHTMLContentElement(element)->selectorList();
                 for (CSSSelector* selector = list.first(); selector; selector = list.next(selector))
                     m_selectFeatures.collectFeaturesFromSelector(selector);                    

trunk/Source/WebCore/dom/NodeTraversal.h

@@ -26 +26 @@
 #define NodeTraversal_h
 
+#include "Element.h"
+
 namespace WebCore {
 
-class Node;
-class ContainerNode;
+namespace ElementTraversal {
+
+// First element child of the node.
+Element* firstWithin(const Node*);
+Element* firstWithin(const ContainerNode*);
+// Pre-order traversal skipping non-element nodes.
+Element* next(const Node*);
+Element* next(const Node*, const Node* stayWithin);
+Element* next(const ContainerNode*);
+Element* next(const ContainerNode*, const Node* stayWithin);
+// Like next, but skips children.
+Element* nextSkippingChildren(const Node*);
+Element* nextSkippingChildren(const Node*, const Node* stayWithin);
+Element* nextSkippingChildren(const ContainerNode*);
+Element* nextSkippingChildren(const ContainerNode*, const Node* stayWithin);
+
+}
 
 namespace NodeTraversal {
@@ -60 +77 @@
 Node* previousPostOrder(const Node*, const Node* stayWithin = 0);
 Node* previousSkippingChildrenPostOrder(const Node*, const Node* stayWithin = 0);
+
+}
+
+namespace ElementTraversal {
+template <class NodeType>
+inline Element* firstElementWithinTemplate(NodeType* current)
+{
+    // Except for the root containers, only elements can have element children.
+    Node* node = current->firstChild();
+    while (node && !node->isElementNode())
+        node = node->nextSibling();
+    return toElement(node);
+}
+inline Element* firstWithin(const ContainerNode* current) { return firstElementWithinTemplate(current); }
+inline Element* firstWithin(const Node* current) { return firstElementWithinTemplate(current); }
+
+template <class NodeType>
+inline Element* traverseNextElementTemplate(NodeType* current)
+{
+    Node* node = NodeTraversal::next(current);
+    while (node && !node->isElementNode())
+        node = NodeTraversal::nextSkippingChildren(node);
+    return toElement(node);
+}
+inline Element* next(const ContainerNode* current) { return traverseNextElementTemplate(current); }
+inline Element* next(const Node* current) { return traverseNextElementTemplate(current); }
+
+template <class NodeType>
+inline Element* traverseNextElementTemplate(NodeType* current, const Node* stayWithin)
+{
+    Node* node = NodeTraversal::next(current, stayWithin);
+    while (node && !node->isElementNode())
+        node = NodeTraversal::nextSkippingChildren(node, stayWithin);
+    return toElement(node);
+}
+inline Element* next(const ContainerNode* current, const Node* stayWithin) { return traverseNextElementTemplate(current, stayWithin); }
+inline Element* next(const Node* current, const Node* stayWithin) { return traverseNextElementTemplate(current, stayWithin); }
+
+template <class NodeType>
+inline Element* traverseNextElementSkippingChildrenTemplate(NodeType* current)
+{
+    Node* node = NodeTraversal::nextSkippingChildren(current);
+    while (node && !node->isElementNode())
+        node = NodeTraversal::nextSkippingChildren(node);
+    return toElement(node);
+}
+inline Element* nextSkippingChildren(const ContainerNode* current) { return traverseNextElementSkippingChildrenTemplate(current); }
+inline Element* nextSkippingChildren(const Node* current) { return traverseNextElementSkippingChildrenTemplate(current); }
+
+template <class NodeType>
+inline Element* traverseNextElementSkippingChildrenTemplate(NodeType* current, const Node* stayWithin)
+{
+    Node* node = NodeTraversal::nextSkippingChildren(current, stayWithin);
+    while (node && !node->isElementNode())
+        node = NodeTraversal::nextSkippingChildren(node, stayWithin);
+    return toElement(node);
+}
+inline Element* nextSkippingChildren(const ContainerNode* current, const Node* stayWithin) { return traverseNextElementSkippingChildrenTemplate(current, stayWithin); }
+inline Element* nextSkippingChildren(const Node* current, const Node* stayWithin) { return traverseNextElementSkippingChildrenTemplate(current, stayWithin); }
+}
+
+namespace NodeTraversal {
 
 Node* nextAncestorSibling(const Node*);

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -188 +188 @@
         // Populate the map on first access.
         m_labelsByForAttribute = adoptPtr(new DocumentOrderedMap);
-        for (Node* node = rootNode(); node; node = NodeTraversal::next(node)) {
-            if (node->hasTagName(labelTag)) {
-                HTMLLabelElement* label = static_cast<HTMLLabelElement*>(node);
+        for (Element* element = ElementTraversal::firstWithin(rootNode()); element; element = ElementTraversal::next(element)) {
+            if (element->hasTagName(labelTag)) {
+                HTMLLabelElement* label = static_cast<HTMLLabelElement*>(element);
                 const AtomicString& forValue = label->fastGetAttribute(forAttr);
                 if (!forValue.isEmpty())
@@ -232 +232 @@
     if (Element* element = getElementById(name))
         return element;
-    for (Node* node = rootNode(); node; node = NodeTraversal::next(node)) {
-        if (node->hasTagName(aTag)) {
-            HTMLAnchorElement* anchor = static_cast<HTMLAnchorElement*>(node);
+    for (Element* element = ElementTraversal::firstWithin(rootNode()); element; element = ElementTraversal::next(element)) {
+        if (element->hasTagName(aTag)) {
+            HTMLAnchorElement* anchor = static_cast<HTMLAnchorElement*>(element);
             if (rootNode()->document()->inQuirksMode()) {
                 // Quirks mode, case insensitive comparison of names.

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -1026 +1026 @@
         for (Node* node = NodeTraversal::nextSkippingChildren(startNode, outerNode.get()); node; node = NodeTraversal::nextSkippingChildren(node, outerNode.get())) {
             // Move lastNode up in the tree as much as node was moved up in the
-            // tree by NodeTraversal::nextSibling, so that the relative depth between
+            // tree by NodeTraversal::nextSkippingChildren, so that the relative depth between
             // node and the original start node is maintained in the clone.
             while (startNode->parentNode() != node->parentNode()) {

trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

@@ -505 +505 @@
         while (node && node != m_downstreamEnd.deprecatedNode()) {
             if (comparePositions(firstPositionInOrBeforeNode(node.get()), m_downstreamEnd) >= 0) {
-                // NodeTraversal::nextSibling just blew past the end position, so stop deleting
+                // NodeTraversal::nextSkippingChildren just blew past the end position, so stop deleting
                 node = 0;
             } else if (!m_downstreamEnd.deprecatedNode()->isDescendantOf(node.get())) {

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -1954 +1954 @@
 static HTMLFormElement* scanForForm(Node* start)
 {
-    for (Node* node = start; node; node = NodeTraversal::next(node)) {
-        if (node->hasTagName(formTag))
-            return static_cast<HTMLFormElement*>(node);
-        if (node->isHTMLElement() && toHTMLElement(node)->isFormControlElement())
-            return static_cast<HTMLFormControlElement*>(node)->form();
-        if (node->hasTagName(frameTag) || node->hasTagName(iframeTag)) {
-            Node* childDocument = static_cast<HTMLFrameElementBase*>(node)->contentDocument();
+    Element* element = start && start->isElementNode() ? toElement(start) : ElementTraversal::next(start);
+    for (; element; element = ElementTraversal::next(element)) {
+        if (element->hasTagName(formTag))
+            return static_cast<HTMLFormElement*>(element);
+        if (element->isHTMLElement() && toHTMLElement(element)->isFormControlElement())
+            return static_cast<HTMLFormControlElement*>(element)->form();
+        if (element->hasTagName(frameTag) || element->hasTagName(iframeTag)) {
+            Node* childDocument = static_cast<HTMLFrameElementBase*>(element)->contentDocument();
             if (HTMLFormElement* frameResult = scanForForm(childDocument))
                 return frameResult;

trunk/Source/WebCore/editing/markup.cpp

@@ -97 +97 @@
 };
 
-static void completeURLs(Node* node, const String& baseURL)
+static void completeURLs(DocumentFragment* fragment, const String& baseURL)
 {
     Vector<AttributeChange> changes;
@@ -103 +103 @@
     KURL parsedBaseURL(ParsedURLString, baseURL);
 
-    Node* end = NodeTraversal::nextSkippingChildren(node);
-    for (Node* n = node; n != end; n = NodeTraversal::next(n)) {
-        if (n->isElementNode()) {
-            Element* e = static_cast<Element*>(n);
-            if (!e->hasAttributes())
-                continue;
-            unsigned length = e->attributeCount();
-            for (unsigned i = 0; i < length; i++) {
-                const Attribute* attribute = e->attributeItem(i);
-                if (e->isURLAttribute(*attribute) && !attribute->value().isEmpty())
-                    changes.append(AttributeChange(e, attribute->name(), KURL(parsedBaseURL, attribute->value()).string()));
-            }
+    for (Element* element = ElementTraversal::firstWithin(fragment); element; element = ElementTraversal::next(element, fragment)) {
+        if (!element->hasAttributes())
+            continue;
+        unsigned length = element->attributeCount();
+        for (unsigned i = 0; i < length; i++) {
+            const Attribute* attribute = element->attributeItem(i);
+            if (element->isURLAttribute(*attribute) && !attribute->value().isEmpty())
+                changes.append(AttributeChange(element, attribute->name(), KURL(parsedBaseURL, attribute->value()).string()));
         }
     }

trunk/Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp

@@ -43 +43 @@
 #include "KeyboardEvent.h"
 #include "LocalizedStrings.h"
+#include "NodeTraversal.h"
 #include "Page.h"
 #include "PickerIndicatorElement.h"
@@ -359 +360 @@
 
     AtomicString direction = element()->locale().isRTL() ? AtomicString("rtl", AtomicString::ConstructFromLiteral) : AtomicString("ltr", AtomicString::ConstructFromLiteral);
-    if (Element* container = firstElementChild(element()->userAgentShadowRoot()))
+    if (Element* container = ElementTraversal::firstWithin(element()->userAgentShadowRoot()))
         container->setAttribute(HTMLNames::dirAttr, direction);
 

trunk/Source/WebCore/html/HTMLFieldSetElement.cpp

@@ -52 +52 @@
 void HTMLFieldSetElement::invalidateDisabledStateUnder(Element* base)
 {
-    for (Node* node = base->firstChild(); node; node = NodeTraversal::next(node, base)) {
-        if (node->isElementNode() && toElement(node)->isFormControlElement())
-            static_cast<HTMLFormControlElement*>(node)->ancestorDisabledStateWasChanged();
+    for (Element* element = ElementTraversal::firstWithin(base); element; element = ElementTraversal::next(element, base)) {
+        if (element->isFormControlElement())
+            static_cast<HTMLFormControlElement*>(element)->ancestorDisabledStateWasChanged();
     }
 }
@@ -68 +68 @@
 {
     HTMLFormControlElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
-    for (Element* element = firstElementChild(); element; element = element->nextElementSibling()) {
+    for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::nextSkippingChildren(element, this)) {
         if (element->hasTagName(legendTag))
             invalidateDisabledStateUnder(element);
@@ -92 +92 @@
 HTMLLegendElement* HTMLFieldSetElement::legend() const
 {
-    for (Element* node = firstElementChild(); node; node = node->nextElementSibling()) {
-        if (node->hasTagName(legendTag))
-            return static_cast<HTMLLegendElement*>(node);
+    for (Element* child = ElementTraversal::firstWithin(this); child; child = ElementTraversal::nextSkippingChildren(child, this)) {
+        if (child->hasTagName(legendTag))
+            return static_cast<HTMLLegendElement*>(child);
     }
     return 0;
@@ -114 +114 @@
     m_associatedElements.clear();
 
-    for (Node* node = firstChild(); node; node = NodeTraversal::next(node, this)) {
-        if (!node->isElementNode())
-            continue;
-
-        if (node->hasTagName(objectTag)) {
-            m_associatedElements.append(static_cast<HTMLObjectElement*>(node));
+    for (Element* element = ElementTraversal::firstWithin(this); element; element = ElementTraversal::next(element, this)) {
+        if (element->hasTagName(objectTag)) {
+            m_associatedElements.append(static_cast<HTMLObjectElement*>(element));
             continue;
         }
 
-        if (!toElement(node)->isFormControlElement())
+        if (!element->isFormControlElement())
             continue;
 
-        m_associatedElements.append(static_cast<HTMLFormControlElement*>(node));
+        m_associatedElements.append(static_cast<HTMLFormControlElement*>(element));
     }
 }

trunk/Source/WebCore/html/HTMLFormElement.cpp

@@ -506 +506 @@
 unsigned HTMLFormElement::formElementIndex(FormAssociatedElement* associatedElement)
 {
-    HTMLElement* element = toHTMLElement(associatedElement);
+    HTMLElement* associatedHTMLElement = toHTMLElement(associatedElement);
     // Treats separately the case where this element has the form attribute
     // for performance consideration.
-    if (element->fastHasAttribute(formAttr)) {
-        unsigned short position = compareDocumentPosition(element);
+    if (associatedHTMLElement->fastHasAttribute(formAttr)) {
+        unsigned short position = compareDocumentPosition(associatedHTMLElement);
         if (position & DOCUMENT_POSITION_PRECEDING) {
             ++m_associatedElementsBeforeIndex;
             ++m_associatedElementsAfterIndex;
-            return HTMLFormElement::formElementIndexWithFormAttribute(element, 0, m_associatedElementsBeforeIndex - 1);
+            return HTMLFormElement::formElementIndexWithFormAttribute(associatedHTMLElement, 0, m_associatedElementsBeforeIndex - 1);
         }
         if (position & DOCUMENT_POSITION_FOLLOWING && !(position & DOCUMENT_POSITION_CONTAINED_BY))
-            return HTMLFormElement::formElementIndexWithFormAttribute(element, m_associatedElementsAfterIndex, m_associatedElements.size());
+            return HTMLFormElement::formElementIndexWithFormAttribute(associatedHTMLElement, m_associatedElementsAfterIndex, m_associatedElements.size());
     }
 
@@ -524 +524 @@
     // common case that occurs during parsing; instead we'll just return a value
     // that says "add this form element to the end of the array".
-    if (NodeTraversal::next(element, this)) {
+    if (ElementTraversal::next(associatedHTMLElement, this)) {
         unsigned i = m_associatedElementsBeforeIndex;
-        for (Node* node = this; node; node = NodeTraversal::next(node, this)) {
-            if (node == element) {
+        for (Element* element = this; element; element = ElementTraversal::next(element, this)) {
+            if (element == associatedHTMLElement) {
                 ++m_associatedElementsAfterIndex;
                 return i;
             }
-            if (node->isHTMLElement()
-                    && (static_cast<Element*>(node)->isFormControlElement()
-                        || node->hasTagName(objectTag))
-                    && toHTMLElement(node)->form() == this)
-                ++i;
+            if (!element->isFormControlElement() && !element->hasTagName(objectTag))
+                continue;
+            if (!element->isHTMLElement() || toHTMLElement(element)->form() != this)
+                continue;
+            ++i;
         }
     }

trunk/Source/WebCore/html/HTMLLabelElement.cpp

@@ -76 +76 @@
         // per http://dev.w3.org/html5/spec/Overview.html#the-label-element
         // the form element must be "labelable form-associated element".
-        Node* node = this;
-        while ((node = NodeTraversal::next(node, this))) {
-            if (LabelableElement* element = nodeAsLabelableElement(node))
-                return element;
+        Element* element = this;
+        while ((element = ElementTraversal::next(element, this))) {
+            if (LabelableElement* labelableElement = nodeAsLabelableElement(element))
+                return labelableElement;
         }
         return 0;

trunk/Source/WebCore/html/HTMLLegendElement.cpp

@@ -51 +51 @@
 {
     // Check if there's a fieldset belonging to this legend.
-    ContainerNode* fieldset = parentNode();
+    Element* fieldset = parentElement();
     while (fieldset && !fieldset->hasTagName(fieldsetTag))
-        fieldset = fieldset->parentNode();
+        fieldset = fieldset->parentElement();
     if (!fieldset)
         return 0;
@@ -59 +59 @@
     // Find first form element inside the fieldset that is not a legend element.
     // FIXME: Should we consider tabindex?
-    Node* node = fieldset;
-    while ((node = NodeTraversal::next(node, fieldset))) {
-        if (node->isElementNode()) {
-            Element* element = static_cast<Element*>(node);
-            if (element->isFormControlElement())
-                return static_cast<HTMLFormControlElement*>(element);
-        }
+    Element* element = fieldset;
+    while ((element = ElementTraversal::next(element, fieldset))) {
+        if (element->isFormControlElement())
+            return static_cast<HTMLFormControlElement*>(element);
     }
 

trunk/Source/WebCore/html/HTMLMapElement.cpp

@@ -63 +63 @@
 {
     HTMLAreaElement* defaultArea = 0;
-    Node *node = this;
-    while ((node = NodeTraversal::next(node, this))) {
-        if (node->hasTagName(areaTag)) {
-            HTMLAreaElement* areaElt = static_cast<HTMLAreaElement*>(node);
+    Element* element = this;
+    while ((element = ElementTraversal::next(element, this))) {
+        if (element->hasTagName(areaTag)) {
+            HTMLAreaElement* areaElt = static_cast<HTMLAreaElement*>(element);
             if (areaElt->isDefault()) {
                 if (!defaultArea)

trunk/Source/WebCore/html/HTMLNameCollection.cpp

@@ -55 +55 @@
     ASSERT(previous != ownerNode());
 
-    Node* current;
+    Element* current;
     if (!previous)
-        current = ownerNode()->firstChild();
+        current = ElementTraversal::firstWithin(ownerNode());
     else
-        current = NodeTraversal::next(previous, ownerNode());
+        current = ElementTraversal::next(previous, ownerNode());
 
-    for (; current; current = NodeTraversal::next(current, ownerNode())) {
-        if (!current->isElementNode())
-            continue;
-        Element* e = static_cast<Element*>(current);
+    for (; current; current = ElementTraversal::next(current, ownerNode())) {
         switch (type()) {
-            case WindowNamedItems:
-                // find only images, forms, applets, embeds and objects by name, 
-                // but anything by id
-                if (e->hasTagName(imgTag) ||
-                    e->hasTagName(formTag) ||
-                    e->hasTagName(appletTag) ||
-                    e->hasTagName(embedTag) ||
-                    e->hasTagName(objectTag))
-                    if (e->getNameAttribute() == m_name)
-                        return e;
-                if (e->getIdAttribute() == m_name)
-                    return e;
-                break;
-            case DocumentNamedItems:
-                // find images, forms, applets, embeds, objects and iframes by name, 
-                // applets and object by id, and images by id but only if they have
-                // a name attribute (this very strange rule matches IE)
-                if (e->hasTagName(formTag) || e->hasTagName(embedTag) || e->hasTagName(iframeTag)) {
-                    if (e->getNameAttribute() == m_name)
-                        return e;
-                } else if (e->hasTagName(appletTag)) {
-                    if (e->getNameAttribute() == m_name || e->getIdAttribute() == m_name)
-                        return e;
-                } else if (e->hasTagName(objectTag)) {
-                    if ((e->getNameAttribute() == m_name || e->getIdAttribute() == m_name)
-                            && static_cast<HTMLObjectElement*>(e)->isDocNamedItem())
-                        return e;
-                } else if (e->hasTagName(imgTag)) {
-                    if (e->getNameAttribute() == m_name || (e->getIdAttribute() == m_name && e->hasName()))
-                        return e;
-                }
-                break;
+        case WindowNamedItems:
+            // find only images, forms, applets, embeds and objects by name, 
+            // but anything by id
+            if (current->hasTagName(imgTag)
+                || current->hasTagName(formTag)
+                || current->hasTagName(appletTag)
+                || current->hasTagName(embedTag)
+                || current->hasTagName(objectTag)) {
+                if (current->getNameAttribute() == m_name)
+                    return current;
+            }
+            if (current->getIdAttribute() == m_name)
+                return current;
+            break;
+        case DocumentNamedItems:
+            // find images, forms, applets, embeds, objects and iframes by name, 
+            // applets and object by id, and images by id but only if they have
+            // a name attribute (this very strange rule matches IE)
+            if (current->hasTagName(formTag) || current->hasTagName(embedTag) || current->hasTagName(iframeTag)) {
+                if (current->getNameAttribute() == m_name)
+                    return current;
+            } else if (current->hasTagName(appletTag)) {
+                if (current->getNameAttribute() == m_name || current->getIdAttribute() == m_name)
+                    return current;
+            } else if (current->hasTagName(objectTag)) {
+                if ((current->getNameAttribute() == m_name || current->getIdAttribute() == m_name)
+                    && static_cast<HTMLObjectElement*>(current)->isDocNamedItem())
+                    return current;
+            } else if (current->hasTagName(imgTag)) {
+                if (current->getNameAttribute() == m_name || (current->getIdAttribute() == m_name && current->hasName()))
+                    return current;
+            }
+            break;
         default:
             ASSERT_NOT_REACHED();

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -42 +42 @@
 #include "MIMETypeRegistry.h"
 #include "NodeList.h"
+#include "NodeTraversal.h"
 #include "Page.h"
 #include "PluginViewBase.h"
@@ -458 +459 @@
         return true;
         
-    for (Element* child = firstElementChild(); child; child = child->nextElementSibling()) {
+    for (Element* child = ElementTraversal::firstWithin(this); child; child = ElementTraversal::nextSkippingChildren(child, this)) {
         if (child->hasTagName(paramTag)
                 && equalIgnoringCase(child->getNameAttribute(), "type")

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -736 +736 @@
     HTMLOptionElement* foundSelected = 0;
     HTMLOptionElement* firstOption = 0;
-    for (Node* currentNode = this->firstChild(); currentNode;) {
-        if (!currentNode->isHTMLElement()) {
-            currentNode = NodeTraversal::nextSkippingChildren(currentNode, this);
+    for (Element* currentElement = ElementTraversal::firstWithin(this); currentElement; ) {
+        if (!currentElement->isHTMLElement()) {
+            currentElement = ElementTraversal::nextSkippingChildren(currentElement, this);
             continue;
         }
-
-        HTMLElement* current = toHTMLElement(currentNode);
+        HTMLElement* current = toHTMLElement(currentElement);
 
         // optgroup tags may not nest. However, both FireFox and IE will
@@ -750 +749 @@
             m_listItems.append(current);
             if (current->firstChild()) {
-                currentNode = current->firstChild();
+                currentElement = ElementTraversal::firstWithin(current);
                 continue;
             }
@@ -777 +776 @@
 
         // In conforming HTML code, only <optgroup> and <option> will be found
-        // within a <select>. We call NodeTraversal::nextSibling so that we only step
+        // within a <select>. We call NodeTraversal::nextSkippingChildren so that we only step
         // into those tags that we choose to. For web-compat, we should cope
         // with the case where odd tags like a <div> have been added but we
         // handle this because such tags have already been removed from the
         // <select>'s subtree at this point.
-        currentNode = NodeTraversal::nextSkippingChildren(currentNode, this);
+        currentElement = ElementTraversal::nextSkippingChildren(currentElement, this);
     }
 

trunk/Source/WebCore/html/shadow/ContentDistributor.cpp

@@ -103 +103 @@
         return m_insertionPointList;
 
-    for (Node* node = shadowRoot; node; node = NodeTraversal::next(node, shadowRoot)) {
-        if (node->isInsertionPoint())
-            m_insertionPointList.append(toInsertionPoint(node));
+    for (Element* element = ElementTraversal::firstWithin(shadowRoot); element; element = ElementTraversal::next(element, shadowRoot)) {
+        if (element->isInsertionPoint())
+            m_insertionPointList.append(toInsertionPoint(element));
     }
 

trunk/Source/WebCore/page/FocusController.cpp

@@ -771 +771 @@
     Node* focusedNode = (focusedFrame() && focusedFrame()->document()) ? focusedFrame()->document()->focusedNode() : 0;
 
-    Node* node = container->firstChild();
+    Element* element = ElementTraversal::firstWithin(container);
     FocusCandidate current;
     current.rect = startingRect;
@@ -777 +777 @@
     current.visibleNode = focusedNode;
 
-    for (; node; node = (node->isFrameOwnerElement() || canScrollInDirection(node, direction)) ? NodeTraversal::nextSkippingChildren(node, container) : NodeTraversal::next(node, container)) {
-        if (node == focusedNode)
+    for (; element; element = (element->isFrameOwnerElement() || canScrollInDirection(element, direction))
+        ? ElementTraversal::nextSkippingChildren(element, container)
+        : ElementTraversal::next(element, container)) {
+        if (element == focusedNode)
             continue;
 
-        if (!node->isElementNode())
+        if (!element->isKeyboardFocusable(event) && !element->isFrameOwnerElement() && !canScrollInDirection(element, direction))
             continue;
 
-        if (!node->isKeyboardFocusable(event) && !node->isFrameOwnerElement() && !canScrollInDirection(node, direction))
-            continue;
-
-        FocusCandidate candidate = FocusCandidate(node, direction);
+        FocusCandidate candidate = FocusCandidate(element, direction);
         if (candidate.isNull())
             continue;

trunk/Source/WebCore/rendering/RenderCounter.cpp

@@ -28 +28 @@
 #include "HTMLNames.h"
 #include "HTMLOListElement.h"
+#include "NodeTraversal.h"
 #include "RenderListItem.h"
 #include "RenderListMarker.h"
@@ -191 +192 @@
         return 0;
     }
-    child = self->firstElementChild();
+    child = ElementTraversal::firstWithin(self);
     while (true) {
         while (child) {
@@ -197 +198 @@
             if (result)
                 return result;
-            child = child->nextElementSibling();
+            child = ElementTraversal::nextSkippingChildren(child, self);
         }
         result = rendererOfAfterPseudoElement(self->renderer());
@@ -205 +206 @@
         if (self == stayWithin)
             return 0;
-        child = self->nextElementSibling();
+        child = ElementTraversal::nextSkippingChildren(self);
         self = self->parentElement();
         if (!self) {

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -347 +347 @@
 {
     Vector<RefPtr<Node> > nodes;
-    Node* node = NodeTraversal::next(referenceElement ? referenceElement : this);
-    while (node) {
-        if (node->isSVGElement()) { 
+    Element* element = ElementTraversal::next(referenceElement ? referenceElement : this);
+    while (element) {
+        if (element->isSVGElement()) { 
             if (collect == CollectIntersectionList) {
-                if (checkIntersection(static_cast<SVGElement*>(node), rect))
-                    nodes.append(node);
+                if (checkIntersection(static_cast<SVGElement*>(element), rect))
+                    nodes.append(element);
             } else {
-                if (checkEnclosure(static_cast<SVGElement*>(node), rect))
-                    nodes.append(node);
+                if (checkEnclosure(static_cast<SVGElement*>(element), rect))
+                    nodes.append(element);
             }
         }
 
-        node = NodeTraversal::next(node, referenceElement ? referenceElement : this);
+        element = ElementTraversal::next(element, referenceElement ? referenceElement : this);
     }
     return StaticNodeList::adopt(nodes);

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -29 +29 @@
 #include "EventNames.h"
 #include "HTMLNames.h"
+#include "NodeTraversal.h"
 #include "RenderObject.h"
 #include "RenderSVGResource.h"
@@ -101 +102 @@
     // If we aren't an instance in a <use> or the <use> title was not found, then find the first
     // <title> child of this element.
-    Element* titleElement = firstElementChild();
-    for (; titleElement; titleElement = titleElement->nextElementSibling()) {
+    Element* titleElement = ElementTraversal::firstWithin(this);
+    for (; titleElement; titleElement = ElementTraversal::nextSkippingChildren(titleElement, this)) {
         if (titleElement->hasTagName(SVGNames::titleTag) && titleElement->isSVGElement())
             break;

trunk/Source/WebCore/svg/SVGUseElement.cpp

@@ -685 +685 @@
 }
 
-static inline void removeDisallowedElementsFromSubtree(Node* subtree)
+static inline void removeDisallowedElementsFromSubtree(Element* subtree)
 {
     ASSERT(!subtree->inDocument());
-    Node* node = subtree->firstChild();
-    while (node) {
-        if (isDisallowedElement(node)) {
-            Node* next = NodeTraversal::nextSkippingChildren(node, subtree);
+    Element* element = ElementTraversal::firstWithin(subtree);
+    while (element) {
+        if (isDisallowedElement(element)) {
+            Element* next = ElementTraversal::nextSkippingChildren(element, subtree);
             // The subtree is not in document so this won't generate events that could mutate the tree.
-            node->parentNode()->removeChild(node);
-            node = next;
+            element->parentNode()->removeChild(element);
+            element = next;
         } else
-            node = NodeTraversal::next(node, subtree);
+            element = ElementTraversal::next(element, subtree);
     }
 }

trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp

@@ -226 +226 @@
 {
     unsigned timingElementCount = 0;
-    for (Node* node = m_ownerSVGElement; node; node = NodeTraversal::next(node, m_ownerSVGElement)) {
-        if (SVGSMILElement::isSMILElement(node))
-            static_cast<SVGSMILElement*>(node)->setDocumentOrderIndex(timingElementCount++);
+    for (Element* element = m_ownerSVGElement; element; element = ElementTraversal::next(element, m_ownerSVGElement)) {
+        if (SVGSMILElement::isSMILElement(element))
+            static_cast<SVGSMILElement*>(element)->setDocumentOrderIndex(timingElementCount++);
     }
     m_documentOrderIndexesDirty = false;