Fix for 3800316, test 37 for tables is failing on the layout tests. Make sure we don't incorrectly match

David Hyatt · David Hyatt · commit edb16b16f491 · 2004-09-24T22:14:45.000Z
non-HTML elements with HTML tag selectors in CSS. Reviewed by rjw * khtml/css/cssstyleselector.cpp: (khtml::CSSStyleSelector::checkOneSelector): Canonical link: https://commits.webkit.org/6702@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-09-24  David Hyatt  <hyatt@apple.com>
+
+	Fix for 3800316, test 37 for tables is failing on the layout tests.  Make sure we don't incorrectly match
+	non-HTML elements with HTML tag selectors in CSS.
+	
+        Reviewed by rjw
+
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::checkOneSelector):
+
 2004-09-23  David Hyatt  <hyatt@apple.com>
 
 	Fix for 3601920, CSS "tabs" not switching properly on zen garden design.  Improve the repainting to account
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
@@ -1048,8 +1048,9 @@ bool CSSStyleSelector::checkOneSelector(DOM::CSSSelector *sel, DOM::ElementImpl
         Q_UINT16 selLocalName = localNamePart(sel->tag);
         Q_UINT16 selNS = namespacePart(sel->tag);
         
-        if (selNS == xhtmlNamespace && localName < ID_LAST_TAG)
-            selNS = anyNamespace; // Always match HTML elements even when in HTML docs.
+        if (localName < ID_LAST_TAG && e->isHTMLElement())
+            ns = xhtmlNamespace; // FIXME: Really want to move away from this complicated hackery and just
+                                 // switch tags and attr names over to AtomicStrings.
         
         if ((selLocalName != anyLocalName && localName != selLocalName) ||
             (selNS != anyNamespace && ns != selNS))
