Changeset 27441 in webkit

Timestamp:

Nov 5, 2007, 10:52:49 AM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Oliver Hunt.

• fix ASSERTION FAILED: !HashTranslator::equal(KeyTraits::emptyValue(), key) when a class attribute is all-whitespace

Test: fast/dom/class-all-whitespace.html

• dom/StyledElement.cpp: (WebCore::StyledElement::parseMappedAttribute): Check if there is any non-whitespace character in the class attribute.

LayoutTests:

Reviewed by Oliver Hunt.

• test that an all-whitespace class attribute does not cause an assertion failure

• fast/dom/class-all-whitespace-expected.txt: Added.
• fast/dom/class-all-whitespace.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/class-all-whitespace-expected.txt (added)
• LayoutTests/fast/dom/class-all-whitespace.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/StyledElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-11-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        - test that an all-whitespace class attribute does not cause an assertion failure
+
+        * fast/dom/class-all-whitespace-expected.txt: Added.
+        * fast/dom/class-all-whitespace.html: Added.
+
 2007-11-05  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-05  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        - fix ASSERTION FAILED: !HashTranslator::equal(KeyTraits::emptyValue(), key) when a class attribute is all-whitespace
+
+        Test: fast/dom/class-all-whitespace.html
+
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::parseMappedAttribute): Check if there is any
+        non-whitespace character in the class attribute.
+
 2007-11-05  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/dom/StyledElement.cpp

@@ -217 +217 @@
     } else if (attr->name() == classAttr) {
         // class
-        setHasClass(!attr->isEmpty());
+        bool hasClass = false;
+        if (!attr->isEmpty()) {
+            const AtomicString& value = attr->value();
+            unsigned len = value.length();
+            for (unsigned i = 0; i < len; ++i) {
+                if (!isClassWhitespace(value[i])) {
+                    hasClass = true;
+                    break;
+                }
+            }
+        }
+        setHasClass(hasClass);
         if (namedAttrMap)
             mappedAttributes()->parseClassAttribute(attr->value());