Changeset 74629 in webkit

Timestamp:

Dec 24, 2010 3:54:24 AM (13 years ago)

Author:

jschuh@chromium.org

Message:

2010-12-24 Justin Schuh <​jschuh@chromium.org>

Reviewed by Darin Adler.

setTargetAttributeAnimatedValue should check for a null shadowTreeElement.
​https://bugs.webkit.org/show_bug.cgi?id=51576

• svg/custom/animate-disallowed-use-element-expected.txt: Added.
• svg/custom/animate-disallowed-use-element.svg: Added.

2010-12-24 Justin Schuh <​jschuh@chromium.org>

Reviewed by Darin Adler.

setTargetAttributeAnimatedValue should check for a null shadowTreeElement.
​https://bugs.webkit.org/show_bug.cgi?id=51576

Disallowed elements may be pruned from the shadow tree, leaving a null
shadowTreeElement. We should check for that before setting attributes.

Test: svg/custom/animate-disallowed-use-element.svg

• svg/SVGAnimationElement.cpp: (WebCore::SVGAnimationElement::setTargetAttributeAnimatedValue):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/animate-disallowed-use-element-expected.txt (added)
• LayoutTests/svg/custom/animate-disallowed-use-element.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGAnimationElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-24  Justin Schuh  <jschuh@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        setTargetAttributeAnimatedValue should check for a null shadowTreeElement.
+        https://bugs.webkit.org/show_bug.cgi?id=51576
+
+        * svg/custom/animate-disallowed-use-element-expected.txt: Added.
+        * svg/custom/animate-disallowed-use-element.svg: Added.
+
 2010-12-24  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-24  Justin Schuh  <jschuh@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        setTargetAttributeAnimatedValue should check for a null shadowTreeElement.
+        https://bugs.webkit.org/show_bug.cgi?id=51576
+
+        Disallowed elements may be pruned from the shadow tree, leaving a null
+        shadowTreeElement. We should check for that before setting attributes.
+
+        Test: svg/custom/animate-disallowed-use-element.svg
+
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::setTargetAttributeAnimatedValue):
+
 2010-12-24  Evan Martin  <evan@chromium.org>
 

trunk/WebCore/svg/SVGAnimationElement.cpp

@@ -353 +353 @@
     for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
         SVGElement* shadowTreeElement = (*it)->shadowTreeElement();
-        ASSERT(shadowTreeElement);
+        if (!shadowTreeElement)
+            continue;
         if (isCSS)
             shadowTreeElement->style()->setProperty(attributeName, value, "", ec);