Changeset 37391 in webkit

Timestamp:

Oct 7, 2008 2:27:54 PM (16 years ago)

Author:

eric@webkit.org

Message:

Reviewed by Darin Adler, Nikolas Zimmermann and Dave Hyatt.

svgElement.className.baseValue = "foo" does not work
​https://bugs.webkit.org/show_bug.cgi?id=20651

• dom/StyledElement.cpp: (WebCore::StyledElement::classAttributeChanged): (WebCore::StyledElement::parseMappedAttribute):
• dom/StyledElement.h:
• svg/SVGStyledElement.cpp: (WebCore::SVGStyledElement::svgAttributeChanged):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/class-baseValue-expected.checksum (added)
• LayoutTests/platform/mac/svg/custom/class-baseValue-expected.png (added)
• LayoutTests/platform/mac/svg/custom/class-baseValue-expected.txt (added)
• LayoutTests/svg/custom/class-baseValue.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/StyledElement.cpp (modified) (2 diffs)
• WebCore/dom/StyledElement.h (modified) (1 diff)
• WebCore/svg/SVGStyledElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-10-06  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Darin Adler, Nikolas Zimmermann and Dave Hyatt.
+        
+        svgElement.className.baseValue = "foo" doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=20651
+
+        * svg/custom/class-baseValue.svg: Added.
+
 2008-10-04  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-02  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Darin Adler, Nikolas Zimmermann and Dave Hyatt.
+
+        svgElement.className.baseValue = "foo" does not work
+        https://bugs.webkit.org/show_bug.cgi?id=20651
+
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::classAttributeChanged):
+        (WebCore::StyledElement::parseMappedAttribute):
+        * dom/StyledElement.h:
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::svgAttributeChanged):
+
 2008-10-06  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/dom/StyledElement.cpp

@@ -211 +211 @@
 }
 
+void StyledElement::classAttributeChanged(const AtomicString& newClassString)
+{
+    const UChar* characters = newClassString.characters();
+    unsigned length = newClassString.length();
+    unsigned i;
+    for (i = 0; i < length; ++i) {
+        if (!isClassWhitespace(characters[i]))
+            break;
+    }
+    setHasClass(i < length);
+    if (namedAttrMap) {
+        if (i < length)
+            mappedAttributes()->setClass(newClassString);
+        else
+            mappedAttributes()->clearClass();
+    }
+    setChanged();
+}
+
 void StyledElement::parseMappedAttribute(MappedAttribute *attr)
 {
@@ -225 +244 @@
         }
         setChanged();
-    } else if (attr->name() == classAttr) {
-        // class
-        const AtomicString& value = attr->value();
-        const UChar* characters = value.characters();
-        unsigned length = value.length();
-        unsigned i;
-        for (i = 0; i < length; ++i) {
-            if (!isClassWhitespace(characters[i]))
-                break;
-        }
-        setHasClass(i < length);
-        if (namedAttrMap) {
-            if (i < length)
-                mappedAttributes()->setClass(value);
-            else
-                mappedAttributes()->clearClass();
-        }
-        setChanged();
-    } else if (attr->name() == styleAttr) {
+    } else if (attr->name() == classAttr)
+        classAttributeChanged(attr->value());
+    else if (attr->name() == styleAttr) {
         if (attr->isNull())
             destroyInlineStyleDecl();

trunk/WebCore/dom/StyledElement.h

@@ -82 +82 @@
 
 protected:
+    // classAttributeChanged() exists to share code between
+    // parseMappedAttribute (called via setAttribute()) and
+    // svgAttributeChanged (called when element.className.baseValue is set)
+    void classAttributeChanged(const AtomicString& newClassString);
+
     RefPtr<CSSMutableStyleDeclaration> m_inlineStyleDecl;
 };

trunk/WebCore/svg/SVGStyledElement.cpp

@@ -187 +187 @@
     SVGElement::svgAttributeChanged(attrName);
 
+    if (attrName == HTMLNames::classAttr)
+        classAttributeChanged(className());
+
     // If we're the child of a resource element, be sure to invalidate it.
     invalidateResourcesInAncestorChain();