Changeset 157368 in webkit

Timestamp:

Oct 13, 2013, 6:26:07 AM (12 years ago)

Author:

Antti Koivisto

Message:

Add traverseNextSkippingChildren to ElementIterators
​https://bugs.webkit.org/show_bug.cgi?id=122727

Reviewed by Andreas Kling.

Also switch some code using ElementTraversal over to iterators.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleInvalidationAnalysis.cpp (modified) (3 diffs)
• dom/ElementIterator.h (modified) (4 diffs)
• editing/ReplaceSelectionCommand.cpp (modified) (3 diffs)
• svg/SVGUseElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-13  Antti Koivisto  <antti@apple.com>
+
+        Add traverseNextSkippingChildren to ElementIterators
+        https://bugs.webkit.org/show_bug.cgi?id=122727
+
+        Reviewed by Andreas Kling.
+
+        Also switch some code using ElementTraversal over to iterators.
+
 2013-10-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp

@@ -29 +29 @@
 #include "CSSSelectorList.h"
 #include "Document.h"
-#include "ElementTraversal.h"
+#include "ElementIterator.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
@@ -99 +99 @@
 }
 
-static bool elementMatchesSelectorScopes(const Element* 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()))
+    if (!idScopes.isEmpty() && element.hasID() && idScopes.contains(element.idForStyleResolution().impl()))
         return true;
-    if (classScopes.isEmpty() || !element->hasClass())
+    if (classScopes.isEmpty() || !element.hasClass())
         return false;
-    const SpaceSplitString& classNames = element->classNames();
+    const SpaceSplitString& classNames = element.classNames();
     for (unsigned i = 0; i < classNames.size(); ++i) {
         if (classScopes.contains(classNames[i].impl()))
@@ -118 +118 @@
     if (m_idScopes.isEmpty() && m_classScopes.isEmpty())
         return;
-    Element* element = ElementTraversal::firstWithin(document);
-    while (element) {
-        if (elementMatchesSelectorScopes(element, m_idScopes, m_classScopes)) {
-            element->setNeedsStyleRecalc();
+
+    auto it = elementDescendants(document).begin();
+    auto end = elementDescendants(document).end();
+    while (it != end) {
+        if (elementMatchesSelectorScopes(*it, m_idScopes, m_classScopes)) {
+            it->setNeedsStyleRecalc();
             // The whole subtree is now invalidated, we can skip to the next sibling.
-            element = ElementTraversal::nextSkippingChildren(element);
+            it.traverseNextSkippingChildren();
             continue;
         }
-        element = ElementTraversal::next(element);
+        ++it;
     }
 }

trunk/Source/WebCore/dom/ElementIterator.h

@@ -51 +51 @@
     ElementIterator& traverseNextSibling();
     ElementIterator& traversePreviousSibling();
+    ElementIterator& traverseNextSkippingChildren();
     ElementIterator& traverseAncestor();
 
@@ -78 +79 @@
     ElementConstIterator& traverseNextSibling();
     ElementConstIterator& traversePreviousSibling();
+    ElementConstIterator& traverseNextSkippingChildren();
     ElementConstIterator& traverseAncestor();
 
@@ -156 +158 @@
     ASSERT(!m_assertions.domTreeHasMutated());
     m_current = Traversal<ElementType>::previousSibling(m_current);
+#if !ASSERT_DISABLED
+    // Drop the assertion when the iterator reaches the end.
+    if (!m_current)
+        m_assertions.dropEventDispatchAssertion();
+#endif
+    return *this;
+}
+
+template <typename ElementType>
+inline ElementIterator<ElementType>& ElementIterator<ElementType>::traverseNextSkippingChildren()
+{
+    ASSERT(m_current);
+    ASSERT(!m_assertions.domTreeHasMutated());
+    m_current = Traversal<ElementType>::nextSkippingChildren(m_current, m_root);
 #if !ASSERT_DISABLED
     // Drop the assertion when the iterator reaches the end.
@@ -301 +317 @@
 
 template <typename ElementType>
+inline ElementConstIterator<ElementType>& ElementConstIterator<ElementType>::traverseNextSkippingChildren()
+{
+    ASSERT(m_current);
+    ASSERT(!m_assertions.domTreeHasMutated());
+    m_current = Traversal<ElementType>::nextSkippingChildren(m_current, m_root);
+#if !ASSERT_DISABLED
+    // Drop the assertion when the iterator reaches the end.
+    if (!m_current)
+        m_assertions.dropEventDispatchAssertion();
+#endif
+    return *this;
+}
+
+template <typename ElementType>
 inline ElementConstIterator<ElementType>& ElementConstIterator<ElementType>::traverseAncestor()
 {

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -37 +37 @@
 #include "DocumentFragment.h"
 #include "Element.h"
+#include "ElementIterator.h"
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
@@ -75 +76 @@
 public:
     ReplacementFragment(Document&, DocumentFragment*, const VisibleSelection&);
+
+    DocumentFragment* fragment() { return m_fragment.get(); }
 
     Node* firstChild() const;
@@ -705 +708 @@
 static void removeHeadContents(ReplacementFragment& fragment)
 {
-    Node* next = 0;
-    for (Node* node = fragment.firstChild(); node; node = next) {
-        if (node->hasTagName(baseTag)
-            || node->hasTagName(linkTag)
-            || node->hasTagName(metaTag)
-            || node->hasTagName(styleTag)
-            || isHTMLTitleElement(node)) {
-            next = NodeTraversal::nextSkippingChildren(node);
-            fragment.removeNode(node);
-        } else
-            next = NodeTraversal::next(node);
-    }
+    if (fragment.isEmpty())
+        return;
+
+    Vector<Element*> toRemove;
+
+    auto it = elementDescendants(fragment.fragment()).begin();
+    auto end = elementDescendants(fragment.fragment()).end();
+    while (it != end) {
+        if (it->hasTagName(baseTag) || it->hasTagName(linkTag) || it->hasTagName(metaTag) || it->hasTagName(styleTag) || isHTMLTitleElement(*it)) {
+            toRemove.append(&*it);
+            it.traverseNextSkippingChildren();
+            continue;
+        }
+        ++it;
+    }
+
+    for (unsigned i = 0; i < toRemove.size(); ++i)
+        fragment.removeNode(toRemove[i]);
 }
 

trunk/Source/WebCore/svg/SVGUseElement.cpp

@@ -664 +664 @@
 {
     ASSERT(!subtree.inDocument());
-    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.
-            element->parentNode()->removeChild(element);
-            element = next;
-        } else
-            element = ElementTraversal::next(element, &subtree);
-    }
+    Vector<Element*> toRemove;
+    auto it = elementDescendants(&subtree).begin();
+    auto end = elementDescendants(&subtree).end();
+    while (it != end) {
+        if (isDisallowedElement(*it)) {
+            toRemove.append(&*it);
+            it.traverseNextSkippingChildren();
+            continue;
+        }
+        ++it;
+    }
+    // The subtree is not in document so this won't generate events that could mutate the tree.
+    for (unsigned i = 0; i < toRemove.size(); ++i)
+        toRemove[i]->parentNode()->removeChild(toRemove[i]);
 }