Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1728)

Unified Diff: Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h

Issue 25164005: Merge 158408 "Revert 157959 "Introduce a new reference graph to ..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1650/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/svg/animation/SVGSMILElement.cpp ('k') | Source/core/svg/properties/SVGAnimatedProperty.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h
===================================================================
--- Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h (revision 158536)
+++ Source/core/svg/properties/SVGAnimatedListPropertyTearOff.h (working copy)
@@ -109,18 +109,16 @@
{
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;
}
@@ -155,14 +153,6 @@
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 @@
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;
« no previous file with comments | « Source/core/svg/animation/SVGSMILElement.cpp ('k') | Source/core/svg/properties/SVGAnimatedProperty.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698