Changeset 154682 in webkit

Timestamp:

Aug 27, 2013, 7:39:46 AM (12 years ago)

Author:

Antti Koivisto

Message:

Remove branch from DescendantIteratorAdapter::begin() when invoking for ContainerNode
​https://bugs.webkit.org/show_bug.cgi?id=120358

Reviewed by Andreas Kling.

• dom/ContainerNode.h:

Delete isContainerNode() so it can't be called if there is static knowledge that the object is a ContainerNode.

• dom/DescendantIterator.h:

(WebCore::::DescendantIterator):

Make DescendantIterator use Node* as root instead of ContainerNode*. It is only used for equality comparison.

(WebCore::::begin):

Remove branch. Rely on ElementTraversal specialization for ContainerNodes.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.h (modified) (1 diff)
• dom/DescendantIterator.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-27  Antti Koivisto  <antti@apple.com>
+
+        Remove branch from DescendantIteratorAdapter::begin() when invoking for ContainerNode
+        https://bugs.webkit.org/show_bug.cgi?id=120358
+
+        Reviewed by Andreas Kling.
+
+        * dom/ContainerNode.h:
+        
+            Delete isContainerNode() so it can't be called if there is static knowledge that the object is a ContainerNode.
+
+        * dom/DescendantIterator.h:
+        (WebCore::::DescendantIterator):
+
+            Make DescendantIterator use Node* as root instead of ContainerNode*. It is only used for equality comparison.
+
+        (WebCore::::begin):
+        
+            Remove branch. Rely on ElementTraversal specialization for ContainerNodes.
+
 2013-08-27  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.h

@@ -148 +148 @@
     bool getLowerRightCorner(FloatPoint&) const;
 
+    bool isContainerNode() const WTF_DELETED_FUNCTION;
+
     Node* m_firstChild;
     Node* m_lastChild;

trunk/Source/WebCore/dom/DescendantIterator.h

@@ -38 +38 @@
 class DescendantIterator {
 public:
-    DescendantIterator(const ContainerNode* root);
-    DescendantIterator(const ContainerNode* root, ElementType* current);
+    DescendantIterator(const Node* root);
+    DescendantIterator(const Node* root, ElementType* current);
     DescendantIterator& operator++();
     ElementType& operator*() { return *m_current; }
@@ -46 +46 @@
 
 private:
-    const ContainerNode* m_root;
+    const Node* m_root;
     ElementType* m_current;
 #ifndef NDEBUG
@@ -71 +71 @@
 
 template <typename ElementType>
-inline DescendantIterator<ElementType>::DescendantIterator(const ContainerNode* root)
+inline DescendantIterator<ElementType>::DescendantIterator(const Node* root)
     : m_root(root)
     , m_current(nullptr)
@@ -81 +81 @@
 
 template <typename ElementType>
-inline DescendantIterator<ElementType>::DescendantIterator(const ContainerNode* root, ElementType* current)
+inline DescendantIterator<ElementType>::DescendantIterator(const Node* root, ElementType* current)
     : m_root(root)
     , m_current(current)
@@ -116 +116 @@
 inline DescendantIterator<ElementType> DescendantIteratorAdapter<ElementType, ContainerType>::begin()
 {
-    if (!m_root->isContainerNode())
-        return DescendantIterator<ElementType>(m_root);
-    return DescendantIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(static_cast<ContainerNode*>(m_root)));
+    return DescendantIterator<ElementType>(m_root, Traversal<ElementType>::firstWithin(m_root));
 }