Remove Node.localName and Node.namespaceURI

Source/core/xml/XPathFunctions.cpp

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 347 matching lines @@
 
     result->markSorted(false);
 
     return Value(result, Value::adopt);
 }
 
 static inline String expandedNameLocalPart(Node* node)
 {
     // The local part of an XPath expanded-name matches DOM local name for most node types, except for namespace nodes and processing instruction nodes.
     // But note that Blink does not support namespace nodes.
-    if (node->nodeType() == Node::PROCESSING_INSTRUCTION_NODE)
+    switch (node->nodeType()) {
+    case Node::ELEMENT_NODE:
+        return toElement(node)->localName();
+    case Node::ATTRIBUTE_NODE:
+        return toAttr(node)->localName();
+    case Node::PROCESSING_INSTRUCTION_NODE:
         return toProcessingInstruction(node)->target();
-    return node->localName().string();
+    default:
+        return String();
+    }
+}
+
+static inline String expandedNamespaceURI(Node* node)
+{
+    switch (node->nodeType()) {
+    case Node::ELEMENT_NODE:
+        return toElement(node)->namespaceURI();
+    case Node::ATTRIBUTE_NODE:
+        return toAttr(node)->namespaceURI();
+    default:
+        return String();
+    }
 }
 
 static inline String expandedName(Node* node)
 {
     AtomicString prefix;
 
     switch (node->nodeType()) {
     case Node::ELEMENT_NODE:
         prefix = toElement(node)->prefix();
         break;
@@ skipping 22 matching lines @@
 }
 
 Value FunNamespaceURI::evaluate(EvaluationContext& context) const
 {
     if (argCount() > 0) {
         Value a = arg(0)->evaluate(context);
         if (!a.isNodeSet())
             return "";
 
         Node* node = a.toNodeSet(&context).firstNode();
-        return node ? node->namespaceURI().string() : "";
+        return node ? expandedNamespaceURI(node) : "";
     }
 
-    return context.node->namespaceURI().string();
+    return expandedNamespaceURI(context.node.get());
 }
 
 Value FunName::evaluate(EvaluationContext& context) const
 {
     if (argCount() > 0) {
         Value a = arg(0)->evaluate(context);
         if (!a.isNodeSet())
             return "";
 
         Node* node = a.toNodeSet(&context).firstNode();
@@ skipping 315 matching lines @@
         return nullptr;
 
     Function* function = functionRec->factoryFn();
     function->setArguments(args);
     function->setName(name);
     return function;
 }
 
 }
 }