commit 43495fb359c580d375565a1b5cfc278599e43ddc
author ap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 27 17:21:02 2009 +0000
committer ap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 27 17:21:02 2009 +0000
tree a3f5914a9495cf35497dfa3b7f74ab719d68b4d4
parent 1cbb97de233247f75d04c7303e2aa43e8b864e9f

        Reviewed by Darin Adler.

        https://bugs.webkit.org/show_bug.cgi?id=17725
        XPath should be case insensitive for HTML

        Test: fast/xpath/node-name-case-sensitivity.html

        * xml/XPathStep.cpp: (WebCore::XPath::Step::nodeMatches): Made node name check case insensitive
        for HTML elements in HTML documents.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/xml/XPathStep.cpp

diff --git a/WebCore/xml/XPathStep.cpp b/WebCore/xml/XPathStep.cpp
index bf06e7c..5971d1f 100644
--- a/WebCore/xml/XPathStep.cpp
+++ b/WebCore/xml/XPathStep.cpp
@@ -273,16 +273,20 @@
                 // Node test on the namespace axis is not implemented yet
                 return false;
             }
-            
-            if (name == "*")
-                return node->nodeType() == primaryNodeType(m_axis) && (namespaceURI.isEmpty() || namespaceURI == node->namespaceURI());
 
-            // We use tagQName here because we don't want the element name in uppercase 
-            // like we get with HTML elements.
-            // Paths without namespaces should match HTML elements in HTML documents despite those having an XHTML namespace.
-            return node->nodeType() == Node::ELEMENT_NODE
-                    && static_cast<Element*>(node)->tagQName().localName() == name
-                    && ((node->isHTMLElement() && node->document()->isHTMLDocument() && namespaceURI.isNull()) || namespaceURI == node->namespaceURI());
+            // For other axes, the principal node type is element.
+            ASSERT(primaryNodeType(m_axis) == Node::ELEMENT_NODE);
+            if (node->nodeType() != Node::ELEMENT_NODE)
+                return false;
+
+            if (name == "*")
+                return namespaceURI.isEmpty() || namespaceURI == node->namespaceURI();
+
+            if (node->isHTMLElement() && node->document()->isHTMLDocument()) {
+                // Paths without namespaces should match HTML elements in HTML documents despite those having an XHTML namespace. Names are compared case-insensitively.
+                return equalIgnoringCase(static_cast<Element*>(node)->localName(), name) && (namespaceURI.isNull() || namespaceURI == node->namespaceURI());
+            }
+            return static_cast<Element*>(node)->hasLocalName(name) && namespaceURI == node->namespaceURI();
         }
     }
     ASSERT_NOT_REACHED();