webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 6 insertions, 1 deletions

diff --git a/Source/WebCore/xml/XPathUtil.cpp b/Source/WebCore/xml/XPathUtil.cpp
index 03127af5b..8d3cba79e 100644
--- a/Source/WebCore/xml/XPathUtil.cpp
+++ b/Source/WebCore/xml/XPathUtil.cpp
@@ -47,10 +47,11 @@ 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();
 }
@@ -66,9 +67,13 @@ 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());