Changeset 29212 in webkit

Timestamp:

Jan 6, 2008 12:35:04 PM (16 years ago)

Author:

eric@webkit.org

Message:

Reviewed by darin.

Make attr selectors case-insensitive for certain HTML attributes
​http://bugs.webkit.org/show_bug.cgi?id=15470

Test: fast/css/html-attr-case-sensitivity.html

• css/CSSStyleSelector.cpp: (WebCore::addLocalNameToSet): (WebCore::createHtmlCaseInsensitiveAttributesSet): (WebCore::htmlAttributeHasCaseInsensitiveValue): (WebCore::CSSStyleSelector::checkOneSelector):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/html-attr-case-sensitivity-expected.txt (added)
• LayoutTests/fast/css/html-attr-case-sensitivity.html (added)
• LayoutTests/fast/css/resources/html-attr-case-sensitivity.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ -34 +34 @@
         * fast/dom/Range/range-clone-empty.html: Added.
         * fast/dom/Range/resources/range-clone-empty.js: Added.
+
+2008-01-06  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by darin.
+        
+        Make attr selectors case-insensitive for certain HTML attributes
+        http://bugs.webkit.org/show_bug.cgi?id=15470
+
+        * fast/css/html-attr-case-sensitivity-expected.txt: Added.
+        * fast/css/html-attr-case-sensitivity.html: Added.
+        * fast/css/resources/html-attr-case-sensitivity.js: Added.
 
 2008-01-06  Eric Seidel  <eric@webkit.org>

trunk/WebCore/ChangeLog

@@ -60 +60 @@
         * html/CanvasPattern.cpp:
         (WebCore::CanvasPattern::CanvasPattern):
+
+2008-01-06  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by darin.
+
+        Make attr selectors case-insensitive for certain HTML attributes
+        http://bugs.webkit.org/show_bug.cgi?id=15470
+
+        Test: fast/css/html-attr-case-sensitivity.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::addLocalNameToSet):
+        (WebCore::createHtmlCaseInsensitiveAttributesSet):
+        (WebCore::htmlAttributeHasCaseInsensitiveValue):
+        (WebCore::CSSStyleSelector::checkOneSelector):
 
 2008-01-06  Eric Seidel  <eric@webkit.org>

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1410 +1410 @@
 }
 
+static void addLocalNameToSet(HashSet<AtomicStringImpl*>* set, const QualifiedName& qName)
+{
+    set->add(qName.localName().impl());
+}
+
+static HashSet<AtomicStringImpl*>* createHtmlCaseInsensitiveAttributesSet()
+{
+    // This is the list of attributes in HTML 4.01 with values marked as "[CI]" or case-insensitive
+    // Mozilla treats all other values as case-sensitive, thus so do we.
+    HashSet<AtomicStringImpl*>* attrSet = new HashSet<AtomicStringImpl*>;
+
+    addLocalNameToSet(attrSet, accept_charsetAttr);
+    addLocalNameToSet(attrSet, acceptAttr);
+    addLocalNameToSet(attrSet, alignAttr);
+    addLocalNameToSet(attrSet, alinkAttr);
+    addLocalNameToSet(attrSet, axisAttr);
+    addLocalNameToSet(attrSet, bgcolorAttr);
+    addLocalNameToSet(attrSet, charsetAttr);
+    addLocalNameToSet(attrSet, checkedAttr);
+    addLocalNameToSet(attrSet, clearAttr);
+    addLocalNameToSet(attrSet, codetypeAttr);
+    addLocalNameToSet(attrSet, colorAttr);
+    addLocalNameToSet(attrSet, compactAttr);
+    addLocalNameToSet(attrSet, declareAttr);
+    addLocalNameToSet(attrSet, deferAttr);
+    addLocalNameToSet(attrSet, dirAttr);
+    addLocalNameToSet(attrSet, disabledAttr);
+    addLocalNameToSet(attrSet, enctypeAttr);
+    addLocalNameToSet(attrSet, faceAttr);
+    addLocalNameToSet(attrSet, frameAttr);
+    addLocalNameToSet(attrSet, hreflangAttr);
+    addLocalNameToSet(attrSet, http_equivAttr);
+    addLocalNameToSet(attrSet, langAttr);
+    addLocalNameToSet(attrSet, languageAttr);
+    addLocalNameToSet(attrSet, linkAttr);
+    addLocalNameToSet(attrSet, mediaAttr);
+    addLocalNameToSet(attrSet, methodAttr);
+    addLocalNameToSet(attrSet, multipleAttr);
+    addLocalNameToSet(attrSet, nohrefAttr);
+    addLocalNameToSet(attrSet, noresizeAttr);
+    addLocalNameToSet(attrSet, noshadeAttr);
+    addLocalNameToSet(attrSet, nowrapAttr);
+    addLocalNameToSet(attrSet, readonlyAttr);
+    addLocalNameToSet(attrSet, relAttr);
+    addLocalNameToSet(attrSet, revAttr);
+    addLocalNameToSet(attrSet, rulesAttr);
+    addLocalNameToSet(attrSet, scopeAttr);
+    addLocalNameToSet(attrSet, scrollingAttr);
+    addLocalNameToSet(attrSet, selectedAttr);
+    addLocalNameToSet(attrSet, shapeAttr);
+    addLocalNameToSet(attrSet, targetAttr);
+    addLocalNameToSet(attrSet, textAttr);
+    addLocalNameToSet(attrSet, typeAttr);
+    addLocalNameToSet(attrSet, valignAttr);
+    addLocalNameToSet(attrSet, valuetypeAttr);
+    addLocalNameToSet(attrSet, vlinkAttr);
+
+    return attrSet;
+}
+
+static bool htmlAttributeHasCaseInsensitiveValue(const QualifiedName& attr)
+{
+    static HashSet<AtomicStringImpl*>* htmlCaseInsensitiveAttributesSet = createHtmlCaseInsensitiveAttributesSet();
+    bool isPossibleHTMLAttr = !attr.hasPrefix() && (attr.namespaceURI() == nullAtom);
+    return isPossibleHTMLAttr && htmlCaseInsensitiveAttributesSet->contains(attr.localName().impl());
+}
+
 bool CSSStyleSelector::checkOneSelector(CSSSelector* sel, Element* e, bool isAncestor, bool isSubSelector)
 {
@@ -1447 +1514 @@
             return false; // attribute is not set
 
+        bool caseSensitive = isXMLDoc || !htmlAttributeHasCaseInsensitiveValue(sel->m_attr);
+
         switch (sel->m_match) {
         case CSSSelector::Exact:
-            if ((isXMLDoc && sel->m_value != value) || (!isXMLDoc && !equalIgnoringCase(sel->m_value, value)))
+            if (caseSensitive ? sel->m_value != value : !equalIgnoringCase(sel->m_value, value))
                 return false;
             break;
@@ -1460 +1529 @@
             int startSearchAt = 0;
             while (true) {
-                int foundPos = value.find(sel->m_value, startSearchAt, isXMLDoc);
+                int foundPos = value.find(sel->m_value, startSearchAt, caseSensitive);
                 if (foundPos == -1)
                     return false;
@@ -1475 +1544 @@
         }
         case CSSSelector::Contain:
-            if (!value.contains(sel->m_value, isXMLDoc))
+            if (!value.contains(sel->m_value, caseSensitive))
                 return false;
             break;
         case CSSSelector::Begin:
-            if (!value.startsWith(sel->m_value, isXMLDoc))
+            if (!value.startsWith(sel->m_value, caseSensitive))
                 return false;
             break;
         case CSSSelector::End:
-            if (!value.endsWith(sel->m_value, isXMLDoc))
+            if (!value.endsWith(sel->m_value, caseSensitive))
                 return false;
             break;
@@ -1489 +1558 @@
             if (value.length() < sel->m_value.length())
                 return false;
-            if (!value.startsWith(sel->m_value, isXMLDoc))
+            if (!value.startsWith(sel->m_value, caseSensitive))
                 return false;
             // It they start the same, check for exact match or following '-':
@@ -1501 +1570 @@
         }
     }
-    if (sel->m_match == CSSSelector::PseudoClass) 
-    {
+    if (sel->m_match == CSSSelector::PseudoClass) {
         switch (sel->pseudoType()) {
             // Pseudo classes: