Changeset 155264 in webkit

Timestamp:

Sep 7, 2013, 3:30:41 PM (11 years ago)

Author:

Antti Koivisto

Message:

Simplify ComposedShadowTreeWalker parent traversal
​https://bugs.webkit.org/show_bug.cgi?id=120971

Reviewed by Andreas Kling.

Combine a bunch of parent traversal functions into one.

• dom/ComposedShadowTreeWalker.cpp:

(WebCore::ComposedShadowTreeWalker::traverseParent):
(WebCore::ComposedShadowTreeWalker::previous):

• dom/ComposedShadowTreeWalker.h:

Remove unused fromFirstChild.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ComposedShadowTreeWalker.cpp (modified) (5 diffs)
• dom/ComposedShadowTreeWalker.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-07  Antti Koivisto  <antti@apple.com>
+
+        Simplify ComposedShadowTreeWalker parent traversal
+        https://bugs.webkit.org/show_bug.cgi?id=120971
+
+        Reviewed by Andreas Kling.
+
+        Combine a bunch of parent traversal functions into one.
+
+        * dom/ComposedShadowTreeWalker.cpp:
+        (WebCore::ComposedShadowTreeWalker::traverseParent):
+        (WebCore::ComposedShadowTreeWalker::previous):
+        * dom/ComposedShadowTreeWalker.h:
+        
+            Remove unused fromFirstChild.
+
 2013-09-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

@@ -53 +53 @@
 }
 
-ComposedShadowTreeWalker ComposedShadowTreeWalker::fromFirstChild(const Node* node, Policy policy)
-{
-    ComposedShadowTreeWalker walker(node, policy);
-    walker.firstChild();
-    return walker;
-}
-
 void ComposedShadowTreeWalker::firstChild()
 {
@@ -179 +172 @@
 }
 
-inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node) const
-{
-    ASSERT(node);
-    if (!node->isInsertionPoint())
-        return const_cast<Node*>(node);
-    const InsertionPoint* insertionPoint = toInsertionPoint(node);
-    return insertionPoint->hasDistribution() ? 0 :
-        insertionPoint->isActive() ? traverseParent(node) : const_cast<Node*>(node);
-}
-
 void ComposedShadowTreeWalker::parent()
 {
@@ -196 +179 @@
 }
 
-// FIXME: Use an iterative algorithm so that it can be inlined.
-// https://bugs.webkit.org/show_bug.cgi?id=90415
 Node* ComposedShadowTreeWalker::traverseParent(const Node* node) const
 {
@@ -209 +190 @@
         if (InsertionPoint* insertionPoint = findInsertionPointOf(node))
             return traverseParent(insertionPoint);
-        return 0;
-    }
-    return traverseParentInCurrentTree(node);
-}
-
-inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node) const
-{
-    if (Node* parent = node->parentNode())
-        return parent->isShadowRoot() ? traverseParentBackToShadowRootOrHost(toShadowRoot(parent)) : traverseNodeEscapingFallbackContents(parent);
-    return 0;
-}
-
-Node* ComposedShadowTreeWalker::traverseParentBackToShadowRootOrHost(const ShadowRoot* shadowRoot) const
-{
-    ASSERT(shadowRoot);
-
-    if (canCrossUpperBoundary())
-        return shadowRoot->hostElement();
-
-    return const_cast<ShadowRoot*>(shadowRoot);
+        return nullptr;
+    }
+    ContainerNode* parent = node->parentNode();
+    if (!parent)
+        return nullptr;
+
+    if (parent->isShadowRoot())
+        return canCrossUpperBoundary() ? toShadowRoot(parent)->hostElement() : parent;
+
+    if (parent->isInsertionPoint()) {
+        const InsertionPoint* insertionPoint = toInsertionPoint(parent);
+        if (insertionPoint->hasDistribution())
+            return nullptr;
+        if (insertionPoint->isActive())
+            return traverseParent(parent);
+    }
+    return parent;
 }
 
@@ -267 +245 @@
         m_node = n;
     } else
-        parent();
+        m_node = traverseParent(m_node);
     assertPostcondition();
 }

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.h

@@ -52 +52 @@
 
     ComposedShadowTreeWalker(const Node*, Policy = CrossUpperBoundary, StartPolicy = CannotStartFromShadowBoundary);
-
-    // For a common use case such as:
-    // for (ComposedShadowTreeWalker walker = ComposedShadowTreeWalker::fromFirstChild(node); walker.get(); walker.nextSibling())
-    static ComposedShadowTreeWalker fromFirstChild(const Node*, Policy = CrossUpperBoundary);
 
     Node* get() const { return const_cast<Node*>(m_node); }
@@ -116 +112 @@
     static Node* escapeFallbackContentElement(const Node*, TraversalDirection);
 
-    Node* traverseNodeEscapingFallbackContents(const Node*) const;
-    Node* traverseParentInCurrentTree(const Node*) const;
-    Node* traverseParentBackToShadowRootOrHost(const ShadowRoot*) const;
-
     const Node* m_node;
     Policy m_policy;