Changeset 21934 in webkit

Timestamp:

Jun 1, 2007 1:13:25 AM (17 years ago)

Author:

eseidel

Message:

2007-06-01 Eric Seidel <​eric@webkit.org>

Reviewed by hyatt.

Fix for: ​http://bugs.webkit.org/show_bug.cgi?id=12187

Tests: fast/dom/attribute-case-sensitivity.html, fast/dom/attribute-case-sensitivity2.xhtml

• dom/Element.cpp: (WebCore::shouldIgnoreAttributeCase): check to make sure element is an HTMLElement (WebCore::Element::getAttribute): (WebCore::Element::setAttribute): (WebCore::Element::removeAttribute): (WebCore::Element::getAttributeNode): (WebCore::Element::hasAttribute):
• dom/NamedAttrMap.cpp: (WebCore::shouldIgnoreAttributeCase): (WebCore::NamedAttrMap::getNamedItem): (WebCore::NamedAttrMap::removeNamedItem):

Location:

branches/feature-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/attribute-case-sensitivity-expected.txt (added)
• LayoutTests/fast/dom/attribute-case-sensitivity.html (added)
• LayoutTests/fast/dom/attribute-case-sensitivity2-expected.txt (added)
• LayoutTests/fast/dom/attribute-case-sensitivity2.xhtml (added)
• LayoutTests/fast/dom/resources/attr-case-sensitivity.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (6 diffs)
• WebCore/dom/NamedAttrMap.cpp (modified) (4 diffs)

branches/feature-branch/LayoutTests/ChangeLog

@@ +1 @@
+2007-06-01  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by hyatt.
+        
+        Add tests to document attribute case sensitivity prior to fixing:
+        http://bugs.webkit.org/show_bug.cgi?id=12187
+
+        * fast/dom/attribute-case-sensitivity-expected.txt: Added.
+        * fast/dom/attribute-case-sensitivity.html: Added.
+        * fast/dom/attribute-case-sensitivity2-expected.txt: Added.
+        * fast/dom/attribute-case-sensitivity2.xhtml: Added.
+        * fast/dom/resources/attr-case-sensitivity.js: Added.
+
 2007-05-31  Eric Seidel  <eric@webkit.org>
 

branches/feature-branch/WebCore/ChangeLog

@@ +1 @@
+2007-06-01  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by hyatt.
+
+        Fix for: http://bugs.webkit.org/show_bug.cgi?id=12187
+
+        Tests: fast/dom/attribute-case-sensitivity.html, fast/dom/attribute-case-sensitivity2.xhtml
+
+        * dom/Element.cpp:
+        (WebCore::shouldIgnoreAttributeCase): check to make sure element is an HTMLElement
+        (WebCore::Element::getAttribute):
+        (WebCore::Element::setAttribute):
+        (WebCore::Element::removeAttribute):
+        (WebCore::Element::getAttributeNode):
+        (WebCore::Element::hasAttribute):
+        * dom/NamedAttrMap.cpp:
+        (WebCore::shouldIgnoreAttributeCase):
+        (WebCore::NamedAttrMap::getNamedItem):
+        (WebCore::NamedAttrMap::removeNamedItem):
+
 2007-05-31  Eric Seidel  <eric@webkit.org>
 

branches/feature-branch/WebCore/dom/Element.cpp

@@ -5 +5 @@
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ -394 +395 @@
 }
 
-static inline bool inHTMLDocument(const Element* e)
-{
-    return e && e->document()->isHTMLDocument();
+static inline bool shouldIgnoreAttributeCase(const Element* e)
+{
+    return e && e->document()->isHTMLDocument() && e->isHTMLElement();
 }
 
 const AtomicString& Element::getAttribute(const String& name) const
 {
-    String localName = inHTMLDocument(this) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(this) ? name.lower() : name;
     if (localName == styleAttr.localName())
         updateStyleAttributeIfNeeded();
@@ -424 +425 @@
     }
 
-    String localName = inHTMLDocument(this) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(this) ? name.lower() : name;
 
     // allocate attributemap if necessary
@@ -910 +911 @@
 void Element::removeAttribute(const String& name, ExceptionCode& ec)
 {
-    String localName = inHTMLDocument(this) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(this) ? name.lower() : name;
 
     if (namedAttrMap) {
@@ -929 +930 @@
     if (!attrs)
         return 0;
-    String localName = inHTMLDocument(this) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(this) ? name.lower() : name;
     return static_pointer_cast<Attr>(attrs->getNamedItem(localName));
 }
@@ -946 +947 @@
     if (!attrs)
         return false;
-    String localName = inHTMLDocument(this) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(this) ? name.lower() : name;
     return attrs->getAttributeItem(localName);
 }

branches/feature-branch/WebCore/dom/NamedAttrMap.cpp

@@ -5 +5 @@
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ -34 +35 @@
 using namespace HTMLNames;
 
-static inline bool inHTMLDocument(const Element* e)
-{
-    return e && e->document()->isHTMLDocument();
+static inline bool shouldIgnoreAttributeCase(const Element* e)
+{
+    return e && e->document()->isHTMLDocument() && e->isHTMLElement();
 }
 
@@ -58 +59 @@
 PassRefPtr<Node> NamedAttrMap::getNamedItem(const String& name) const
 {
-    String localName = inHTMLDocument(element) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(element) ? name.lower() : name;
     Attribute* a = getAttributeItem(localName);
     if (!a)
@@ -73 +74 @@
 PassRefPtr<Node> NamedAttrMap::removeNamedItem(const String& name, ExceptionCode& ec)
 {
-    String localName = inHTMLDocument(element) ? name.lower() : name;
+    String localName = shouldIgnoreAttributeCase(element) ? name.lower() : name;
     Attribute* a = getAttributeItem(localName);
     if (!a) {