| Index: Source/core/dom/NodeTraversal.h
|
| diff --git a/Source/core/dom/NodeTraversal.h b/Source/core/dom/NodeTraversal.h
|
| index 52a6c6a2a22abbbcc25f666be57ee1b1fd2f6a30..63b26c5e6530f8091766bde18a7395cab3aba8c1 100644
|
| --- a/Source/core/dom/NodeTraversal.h
|
| +++ b/Source/core/dom/NodeTraversal.h
|
| @@ -64,8 +64,8 @@ Node* previousIncludingPseudo(const Node&, const Node* stayWithin = 0);
|
| Node* nextIncludingPseudo(const Node*, const Node* stayWithin = 0);
|
| Node* nextIncludingPseudoSkippingChildren(const Node*, const Node* stayWithin = 0);
|
|
|
| -Node* nextAncestorSibling(const Node*);
|
| -Node* nextAncestorSibling(const Node*, const Node* stayWithin);
|
| +Node* nextAncestorSibling(const Node&);
|
| +Node* nextAncestorSibling(const Node&, const Node* stayWithin);
|
|
|
| template <class NodeType>
|
| inline Node* traverseNextTemplate(NodeType& current)
|
| @@ -74,7 +74,7 @@ inline Node* traverseNextTemplate(NodeType& current)
|
| return current.firstChild();
|
| if (current.nextSibling())
|
| return current.nextSibling();
|
| - return nextAncestorSibling(¤t);
|
| + return nextAncestorSibling(current);
|
| }
|
| inline Node* next(const Node& current) { return traverseNextTemplate(current); }
|
| inline Node* next(const ContainerNode& current) { return traverseNextTemplate(current); }
|
| @@ -88,32 +88,32 @@ inline Node* traverseNextTemplate(NodeType& current, const Node* stayWithin)
|
| return 0;
|
| if (current.nextSibling())
|
| return current.nextSibling();
|
| - return nextAncestorSibling(¤t, stayWithin);
|
| + return nextAncestorSibling(current, stayWithin);
|
| }
|
| inline Node* next(const Node& current, const Node* stayWithin) { return traverseNextTemplate(current, stayWithin); }
|
| inline Node* next(const ContainerNode& current, const Node* stayWithin) { return traverseNextTemplate(current, stayWithin); }
|
|
|
| template <class NodeType>
|
| -inline Node* traverseNextSkippingChildrenTemplate(NodeType* current)
|
| +inline Node* traverseNextSkippingChildrenTemplate(NodeType& current)
|
| {
|
| - if (current->nextSibling())
|
| - return current->nextSibling();
|
| + if (current.nextSibling())
|
| + return current.nextSibling();
|
| return nextAncestorSibling(current);
|
| }
|
| -inline Node* nextSkippingChildren(const Node* current) { return traverseNextSkippingChildrenTemplate(current); }
|
| -inline Node* nextSkippingChildren(const ContainerNode* current) { return traverseNextSkippingChildrenTemplate(current); }
|
| +inline Node* nextSkippingChildren(const Node& current) { return traverseNextSkippingChildrenTemplate(current); }
|
| +inline Node* nextSkippingChildren(const ContainerNode& current) { return traverseNextSkippingChildrenTemplate(current); }
|
|
|
| template <class NodeType>
|
| -inline Node* traverseNextSkippingChildrenTemplate(NodeType* current, const Node* stayWithin)
|
| +inline Node* traverseNextSkippingChildrenTemplate(NodeType& current, const Node* stayWithin)
|
| {
|
| if (current == stayWithin)
|
| return 0;
|
| - if (current->nextSibling())
|
| - return current->nextSibling();
|
| + if (current.nextSibling())
|
| + return current.nextSibling();
|
| return nextAncestorSibling(current, stayWithin);
|
| }
|
| -inline Node* nextSkippingChildren(const Node* current, const Node* stayWithin) { return traverseNextSkippingChildrenTemplate(current, stayWithin); }
|
| -inline Node* nextSkippingChildren(const ContainerNode* current, const Node* stayWithin) { return traverseNextSkippingChildrenTemplate(current, stayWithin); }
|
| +inline Node* nextSkippingChildren(const Node& current, const Node* stayWithin) { return traverseNextSkippingChildrenTemplate(current, stayWithin); }
|
| +inline Node* nextSkippingChildren(const ContainerNode& current, const Node* stayWithin) { return traverseNextSkippingChildrenTemplate(current, stayWithin); }
|
|
|
| }
|
|
|
|
|