| Index: Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h
|
| diff --git a/Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h b/Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h
|
| index f63a625aafe6cf7baf32910b95fef8fd6cf48398..fdbd217ffd5e0b909a73fadadfdb78977806f2d8 100644
|
| --- a/Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h
|
| +++ b/Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h
|
| @@ -109,18 +109,16 @@ public:
|
| {
|
| 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());
|
| -
|
| - animVal->setValuesAndWrappers(&m_values, &m_wrappers, false);
|
| - ASSERT(animVal->values().size() == animVal->wrappers().size());
|
| - ASSERT(animVal->wrappers().size() == m_wrappers.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());
|
| +
|
| m_animatedWrappers.clear();
|
| m_isAnimating = false;
|
| }
|
| @@ -155,14 +153,6 @@ public:
|
| 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);
|
| @@ -178,14 +168,6 @@ protected:
|
| 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;
|
|
|