Changeset 118878 in webkit

Timestamp:

May 29, 2012, 6:55:21 PM (14 years ago)

Author:

cevans@google.com

Message:

Merge 117792
BUG=127234
Review URL: ​https://chromiumcodereview.appspot.com/10443074

Location:

branches/chromium/1132

Files:

• LayoutTests/svg/custom/bug86119-expected.txt (copied) (copied from trunk/LayoutTests/svg/custom/bug86119-expected.txt )
• LayoutTests/svg/custom/bug86119.html (copied) (copied from trunk/LayoutTests/svg/custom/bug86119.html )
• Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h (modified) (1 diff)

branches/chromium/1132/Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h

@@ -32 +32 @@
     typedef SVGPropertyTearOff<PropertyType> PropertyTearOff;
     typedef PropertyType ContentType;
+
+    virtual ~SVGAnimatedPropertyTearOff()
+    {
+        if (m_baseVal) {
+            ASSERT(m_baseVal->animatedProperty() == this);
+            m_baseVal->setAnimatedProperty(0);
+        }
+        if (m_animVal) {
+            ASSERT(m_animVal->animatedProperty() == this);
+            m_animVal->setAnimatedProperty(0);
+        }
+    }
 
     PropertyTearOff* baseVal()