Merge 158408 "Revert 157959 "Introduce a new reference graph to ..."

Source/core/svg/properties/SVGAnimatedListPropertyTearOff.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 91 matching lines @@
         animVal->setValuesAndWrappers(newAnimVal, &m_animatedWrappers, shouldOwnValues);
         ASSERT(animVal->values().size() == animVal->wrappers().size());
         ASSERT(animVal->wrappers().size() == m_animatedWrappers.size());
         m_isAnimating = true;
     }
 
     void animationEnded()
     {
         ASSERT(m_isAnimating);
         ASSERT(m_animVal);
-        ASSERT(contextElement());
+        ASSERT(m_values.size() == m_wrappers.size());
 
         ListProperty* animVal = static_cast<ListProperty*>(m_animVal.get());
-        if (animVal->wrappers().size()) {
-            ASSERT(m_values.size() == m_wrappers.size());
-            ASSERT(animVal->values().size() == animVal->wrappers().size());
-            ASSERT(animVal->wrappers().size() == m_animatedWrappers.size());
+        ASSERT(animVal->values().size() == animVal->wrappers().size());
+        ASSERT(animVal->wrappers().size() == m_animatedWrappers.size());
 
-            animVal->setValuesAndWrappers(&m_values, &m_wrappers, false);
-            ASSERT(animVal->values().size() == animVal->wrappers().size());
-            ASSERT(animVal->wrappers().size() == m_wrappers.size());
-        }
+        animVal->setValuesAndWrappers(&m_values, &m_wrappers, false);
+        ASSERT(animVal->values().size() == animVal->wrappers().size());
+        ASSERT(animVal->wrappers().size() == m_wrappers.size());
+
         m_animatedWrappers.clear();
         m_isAnimating = false;
     }
 
     void synchronizeWrappersIfNeeded()
     {
         // Eventually the wrapper list needs synchronization because any SVGAnimateLengthList::calculateAnimatedValue() call may
         // mutate the length of our values() list, and thus the wrapper() cache needs synchronization, to have the same size.
         // Also existing wrappers which point directly at elements in the existing SVGLengthList have to be detached (so a copy
         // of them is created, so existing animVal variables in JS are kept-alive). If we'd detach them later the underlying
@@ skipping 14 matching lines @@
     }
 
     void animValDidChange()
     {
         ASSERT(m_isAnimating);
         ASSERT(m_animVal);
         ASSERT(m_values.size() == m_wrappers.size());
         synchronizeWrappersIfNeeded();
     }
 
-    virtual void detachWrappers() OVERRIDE
-    {
-        if (m_animVal) {
-            ListProperty* animVal = static_cast<ListProperty*>(m_animVal.get());
-            animVal->detachListWrappers(0);
-        }
-    }
-
     static PassRefPtr<SVGAnimatedListPropertyTearOff<PropertyType> > create(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& values)
     {
         ASSERT(contextElement);
         return adoptRef(new SVGAnimatedListPropertyTearOff<PropertyType>(contextElement, attributeName, animatedPropertyType, values));
     }
 
 protected:
     SVGAnimatedListPropertyTearOff(SVGElement* contextElement, const QualifiedName& attributeName, AnimatedPropertyType animatedPropertyType, PropertyType& values)
         : SVGAnimatedProperty(contextElement, attributeName, animatedPropertyType)
         , m_values(values)
     {
         if (!values.isEmpty())
             m_wrappers.fill(0, values.size());
     }
 
-    ~SVGAnimatedListPropertyTearOff()
-    {
-        if (m_baseVal)
-            static_cast<ListPropertyTearOff*>(m_baseVal.get())->clearAnimatedProperty();
-        if (m_animVal)
-            static_cast<ListPropertyTearOff*>(m_animVal.get())->clearAnimatedProperty();
-    }
-
     PropertyType& m_values;
 
     ListWrapperCache m_wrappers;
     ListWrapperCache m_animatedWrappers;
 
     RefPtr<SVGProperty> m_baseVal;
     RefPtr<SVGProperty> m_animVal;
 };
 
 }
 
 #endif // SVGAnimatedListPropertyTearOff_h