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

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

Issue 298873003: SVG: SVGAnimateElement should not cache |m_animatedElements| (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove more asserts Created 6 years, 7 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/SVGStaticStringList.cpp ('k') | Source/core/svg/properties/SVGAnimatedProperty.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/properties/SVGAnimatedProperty.h
diff --git a/Source/core/svg/properties/SVGAnimatedProperty.h b/Source/core/svg/properties/SVGAnimatedProperty.h
index 4e8cc91771feabb5b75c5f2bea2fa8da1351b7fd..92d0c9db2d8b9c12cca98ba7a1a8f755db570ddb 100644
--- a/Source/core/svg/properties/SVGAnimatedProperty.h
+++ b/Source/core/svg/properties/SVGAnimatedProperty.h
@@ -50,6 +50,7 @@ public:
virtual ~SVGAnimatedPropertyBase();
virtual SVGPropertyBase* currentValueBase() = 0;
+ virtual bool isAnimating() const = 0;
virtual void animationStarted();
virtual PassRefPtr<SVGPropertyBase> createAnimatedValue() = 0;
@@ -74,11 +75,6 @@ public:
return m_attributeName;
}
- bool isAnimating() const
- {
- return m_isAnimating;
- }
-
bool isReadOnly() const
{
return m_isReadOnly;
@@ -97,7 +93,6 @@ protected:
private:
const AnimatedPropertyType m_type;
bool m_isReadOnly;
- bool m_isAnimating;
// This reference is kept alive from V8 wrapper
SVGElement* m_contextElement;
@@ -130,6 +125,11 @@ public:
return currentValue();
}
+ virtual bool isAnimating() const OVERRIDE
+ {
+ return m_currentValue;
+ }
+
void setBaseValueAsString(const String& value, SVGParsingError& parseError)
{
TrackExceptionState es;
@@ -147,8 +147,6 @@ public:
virtual void setAnimatedValue(PassRefPtr<SVGPropertyBase> passValue) OVERRIDE
{
- ASSERT(isAnimating());
-
RefPtr<SVGPropertyBase> value = passValue;
ASSERT(value->type() == Property::classType());
m_currentValue = static_pointer_cast<Property>(value.release());
@@ -156,7 +154,6 @@ public:
virtual void animationEnded() OVERRIDE
{
- ASSERT(m_currentValue);
m_currentValue.clear();
SVGAnimatedPropertyBase::animationEnded();
« no previous file with comments | « Source/core/svg/SVGStaticStringList.cpp ('k') | Source/core/svg/properties/SVGAnimatedProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698