Remove Node.localName and Node.namespaceURI

Source/core/xml/XPathStep.cpp

 /*
  * Copyright (C) 2005 Frerich Raabe <raabe@kde.org>
  * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
  * 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 168 matching lines @@
         const AtomicString& name = nodeTest.data();
         return node->nodeType() == Node::PROCESSING_INSTRUCTION_NODE && (name.isEmpty() || node->nodeName() == name);
     }
     case Step::NodeTest::AnyNodeTest:
         return true;
     case Step::NodeTest::NameTest: {
         const AtomicString& name = nodeTest.data();
         const AtomicString& namespaceURI = nodeTest.namespaceURI();
 
         if (axis == Step::AttributeAxis) {
-            ASSERT(node->isAttributeNode());
+            Attr* attr = toAttr(node);
 
             // In XPath land, namespace nodes are not accessible on the
             // attribute axis.
-            if (node->namespaceURI() == XMLNSNames::xmlnsNamespaceURI)
+            if (attr->namespaceURI() == XMLNSNames::xmlnsNamespaceURI)
                 return false;
 
             if (name == starAtom)
-                return namespaceURI.isEmpty() || node->namespaceURI() == namespaceURI;
+                return namespaceURI.isEmpty() || attr->namespaceURI() == namespaceURI;
 
-            return node->localName() == name && node->namespaceURI() == namespaceURI;
+            return attr->localName() == name && attr->namespaceURI() == namespaceURI;
         }
 
         // Node test on the namespace axis is not implemented yet, the caller
         // has a check for it.
         ASSERT(axis != Step::NamespaceAxis);
 
         // For other axes, the principal node type is element.
         ASSERT(primaryNodeType(axis) == Node::ELEMENT_NODE);
         if (!node->isElementNode())
             return false;
@@ skipping 155 matching lines @@
     }
 
     case AttributeAxis: {
         if (!context->isElementNode())
             return;
 
         Element* contextElement = toElement(context);
         // Avoid lazily creating attribute nodes for attributes that we do not
         // need anyway.
         if (nodeTest().kind() == NodeTest::NameTest && nodeTest().data() != starAtom) {
-            RefPtrWillBeRawPtr<Node> n = contextElement->getAttributeNodeNS(nodeTest().namespaceURI(), nodeTest().data());
+            RefPtrWillBeRawPtr<Attr> attr = contextElement->getAttributeNodeNS(nodeTest().namespaceURI(), nodeTest().data());
             // In XPath land, namespace nodes are not accessible on the attribute axis.
-            if (n && n->namespaceURI() != XMLNSNames::xmlnsNamespaceURI) {
+            if (attr && attr->namespaceURI() != XMLNSNames::xmlnsNamespaceURI) {
                 // Still need to check merged predicates.
-                if (nodeMatches(evaluationContext, n.get(), AttributeAxis, nodeTest()))
-                    nodes.append(n.release());
+                if (nodeMatches(evaluationContext, attr.get(), AttributeAxis, nodeTest()))
+                    nodes.append(attr.release());
             }
             return;
         }
 
         AttributeCollection attributes = contextElement->attributes();
         for (auto& attribute : attributes) {
             RefPtrWillBeRawPtr<Attr> attr = contextElement->ensureAttr(attribute.name());
             if (nodeMatches(evaluationContext, attr.get(), AttributeAxis, nodeTest()))
                 nodes.append(attr.release());
         }
@@ skipping 38 matching lines @@
         nodes.markSorted(false);
         return;
     }
     }
     ASSERT_NOT_REACHED();
 }
 
 }
 
 }