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/xml/XPathUtil.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Source/WebCore/xml/XPathUtil.cpp') diff --git a/Source/WebCore/xml/XPathUtil.cpp b/Source/WebCore/xml/XPathUtil.cpp index 8d3cba79e..ad0c4754b 100644 --- a/Source/WebCore/xml/XPathUtil.cpp +++ b/Source/WebCore/xml/XPathUtil.cpp @@ -29,7 +29,6 @@ #include "ContainerNode.h" #include "TextNodeTraversal.h" -#include namespace WebCore { namespace XPath { @@ -47,11 +46,10 @@ String stringValue(Node* node) case Node::COMMENT_NODE: case Node::TEXT_NODE: case Node::CDATA_SECTION_NODE: - case Node::XPATH_NAMESPACE_NODE: return node->nodeValue(); default: if (isRootDomNode(node) || node->isElementNode()) - return TextNodeTraversal::contentsAsString(node); + return TextNodeTraversal::contentsAsString(*node); } return String(); } @@ -67,13 +65,9 @@ bool isValidContextNode(Node* node) case Node::DOCUMENT_NODE: case Node::ELEMENT_NODE: case Node::PROCESSING_INSTRUCTION_NODE: - case Node::XPATH_NAMESPACE_NODE: return true; case Node::DOCUMENT_FRAGMENT_NODE: case Node::DOCUMENT_TYPE_NODE: - case Node::ENTITY_NODE: - case Node::ENTITY_REFERENCE_NODE: - case Node::NOTATION_NODE: return false; case Node::TEXT_NODE: return !(node->parentNode() && node->parentNode()->isAttributeNode()); -- cgit v1.2.1