From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/dom/Traversal.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Source/WebCore/dom/Traversal.cpp') diff --git a/Source/WebCore/dom/Traversal.cpp b/Source/WebCore/dom/Traversal.cpp index a0ec37704..3c82a766e 100644 --- a/Source/WebCore/dom/Traversal.cpp +++ b/Source/WebCore/dom/Traversal.cpp @@ -30,25 +30,22 @@ namespace WebCore { -NodeIteratorBase::NodeIteratorBase(PassRefPtr rootNode, unsigned whatToShow, PassRefPtr nodeFilter, bool expandEntityReferences) +NodeIteratorBase::NodeIteratorBase(Node& rootNode, unsigned whatToShow, RefPtr&& nodeFilter) : m_root(rootNode) , m_whatToShow(whatToShow) - , m_filter(nodeFilter) - , m_expandEntityReferences(expandEntityReferences) + , m_filter(WTFMove(nodeFilter)) { } -short NodeIteratorBase::acceptNode(JSC::ExecState* state, Node* node) const +short NodeIteratorBase::acceptNode(Node* node) const { - // FIXME: To handle XML properly we would have to check m_expandEntityReferences. - // The bit twiddling here is done to map DOM node types, which are given as integers from // 1 through 14, to whatToShow bit masks. if (!(((1 << (node->nodeType() - 1)) & m_whatToShow))) return NodeFilter::FILTER_SKIP; if (!m_filter) return NodeFilter::FILTER_ACCEPT; - return m_filter->acceptNode(state, node); + return m_filter->acceptNode(node); } } // namespace WebCore -- cgit v1.2.1