Merge 117792

Source/WebCore/svg/properties/SVGAnimatedPropertyTearOff.h

 /*
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 14 matching lines @@
 #include "SVGPropertyTearOff.h"
 
 namespace WebCore {
 
 template<typename PropertyType>
 class SVGAnimatedPropertyTearOff : public SVGAnimatedProperty {
 public:
     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()
     {
         if (!m_baseVal)
             m_baseVal = PropertyTearOff::create(this, BaseValRole, m_property);
         return m_baseVal.get();
     }
 
     PropertyTearOff* animVal()
     {
         if (!m_animVal)
@@ skipping 66 matching lines @@
 
     PropertyType& m_property;
     RefPtr<PropertyTearOff> m_baseVal;
     RefPtr<PropertyTearOff> m_animVal;
 };
 
 }
 
 #endif // ENABLE(SVG)
 #endif // SVGAnimatedPropertyTearOff_h