Changeset 160544 in webkit

Timestamp:

Dec 13, 2013 6:13:26 AM (10 years ago)

Author:

rwlbuis@webkit.org

Message:

Clean up SVGScriptElement
​https://bugs.webkit.org/show_bug.cgi?id=125527

Reviewed by Darin Adler.

Source/WebCore:

From the Blink port of this bug it becomes clear that svg/dom/SVGScriptElement/script-set-href.svg and
svg/dom/svg-element-attribute-js-null.xhtml still hit an assert in Debug because SVGNames::typeAttr can't
be used with fastGetAttribute in all cases, because it can be animatable. However for SVGScriptElement
it is not animatable, so make isAnimatableAttribute virtual (note Debug only method) and allow typeAttr
in the SVGScriptElement case to be useable for fastGetAttribute.

Test: svg/dom/SVGScriptElement/script-type-attribute.svg

• svg/SVGElement.h:
• svg/SVGScriptElement.cpp:

(WebCore::SVGScriptElement::isAnimatableAttribute):

• svg/SVGScriptElement.h:

LayoutTests:

Add test to verify the new type getter/setter behavior on SVScriptElement.
Specifically, the old behavior was setting the JS type property did not reflect in
the actual content attribute being set, the new behavior is to do set the content
attribute when setting the JS type property.

• svg/dom/SVGScriptElement/script-type-attribute-expected.txt: Added.
• svg/dom/SVGScriptElement/script-type-attribute.svg: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/dom/SVGScriptElement/script-type-attribute-expected.txt (added)
• LayoutTests/svg/dom/SVGScriptElement/script-type-attribute.svg (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGElement.h (modified) (1 diff)
• Source/WebCore/svg/SVGScriptElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGScriptElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-12-13  Rob Buis  <rob.buis@samsung.com>
+
+        Clean up SVGScriptElement
+        https://bugs.webkit.org/show_bug.cgi?id=125527
+
+        Reviewed by Darin Adler.
+
+        Add test to verify the new type getter/setter behavior on SVScriptElement.
+        Specifically, the old behavior was setting the JS type property did not reflect in
+        the actual content attribute being set, the new behavior is to do set the content
+        attribute when setting the JS type property.
+
+        * svg/dom/SVGScriptElement/script-type-attribute-expected.txt: Added.
+        * svg/dom/SVGScriptElement/script-type-attribute.svg: Added.
+
 2013-12-13  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-13  Rob Buis  <rob.buis@samsung.com>
+
+        Clean up SVGScriptElement
+        https://bugs.webkit.org/show_bug.cgi?id=125527
+
+        Reviewed by Darin Adler.
+
+        From the Blink port of this bug it becomes clear that svg/dom/SVGScriptElement/script-set-href.svg and
+        svg/dom/svg-element-attribute-js-null.xhtml still hit an assert in Debug because SVGNames::typeAttr can't
+        be used with fastGetAttribute in all cases, because it can be animatable. However for SVGScriptElement
+        it is not animatable, so make isAnimatableAttribute virtual (note Debug only method) and allow typeAttr
+        in the SVGScriptElement case to be useable for fastGetAttribute.
+
+        Test: svg/dom/SVGScriptElement/script-type-attribute.svg
+
+        * svg/SVGElement.h:
+        * svg/SVGScriptElement.cpp:
+        (WebCore::SVGScriptElement::isAnimatableAttribute):
+        * svg/SVGScriptElement.h:
+
 2013-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/svg/SVGElement.h

@@ -124 +124 @@
 
 #ifndef NDEBUG
-    bool isAnimatableAttribute(const QualifiedName&) const;
+    virtual bool isAnimatableAttribute(const QualifiedName&) const;
 #endif
 

trunk/Source/WebCore/svg/SVGScriptElement.cpp

@@ -199 +199 @@
 }
 
+#ifndef NDEBUG
+bool SVGScriptElement::isAnimatableAttribute(const QualifiedName& name) const
+{
+    if (name == SVGNames::typeAttr)
+        return false;
+
+    return SVGElement::isAnimatableAttribute(name);
+}
+#endif
+
 }
 

trunk/Source/WebCore/svg/SVGScriptElement.h

@@ -39 +39 @@
     static PassRefPtr<SVGScriptElement> create(const QualifiedName&, Document&, bool wasInsertedByParser);
 
+#ifndef NDEBUG
+    virtual bool isAnimatableAttribute(const QualifiedName&) const;
+#endif
 
 private: